diff options
| author | Sean Paul <seanpaul@chromium.org> | 2017-07-17 17:43:05 +0200 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2017-07-17 17:56:07 +0200 |
| commit | ef434a0c2ce765ad33026375db7d23aebd5e9532 (patch) | |
| tree | 4bdac59f0bac3a6508741e6bd62da6e770fc3bc1 /drivers/media/usb/rainshadow-cec/rainshadow-cec.c | |
| parent | dma-buf/fence: Avoid use of uninitialised timestamp (diff) | |
| parent | drm/vc4: Fix VBLANK handling in crtc->enable() path (diff) | |
| download | linux-ef434a0c2ce765ad33026375db7d23aebd5e9532.tar.xz linux-ef434a0c2ce765ad33026375db7d23aebd5e9532.zip | |
Merge branch 'drm-misc-next-fixes' into drm-misc-fixes
Pick up
1ed134e6526b drm/vc4: Fix VBLANK handling in crtc->enable() path
From drm-misc-next-fixes, it was applied after the last pull request
was sent from that branch. We'll send it through drm-fixes instead.
Diffstat (limited to 'drivers/media/usb/rainshadow-cec/rainshadow-cec.c')
| -rw-r--r-- | drivers/media/usb/rainshadow-cec/rainshadow-cec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/usb/rainshadow-cec/rainshadow-cec.c b/drivers/media/usb/rainshadow-cec/rainshadow-cec.c index 541ca543f71f..4126552c9055 100644 --- a/drivers/media/usb/rainshadow-cec/rainshadow-cec.c +++ b/drivers/media/usb/rainshadow-cec/rainshadow-cec.c @@ -119,7 +119,7 @@ static void rain_irq_work_handler(struct work_struct *work) while (true) { unsigned long flags; - bool exit_loop; + bool exit_loop = false; char data; spin_lock_irqsave(&rain->buf_lock, flags); @@ -336,6 +336,7 @@ static int rain_connect(struct serio *serio, struct serio_driver *drv) serio_set_drvdata(serio, rain); INIT_WORK(&rain->work, rain_irq_work_handler); mutex_init(&rain->write_lock); + spin_lock_init(&rain->buf_lock); err = serio_open(serio, drv); if (err) |