History

Merge tag 'media/v4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media fixes from Mauro Carvalho Chehab: "Media regression fixes: - serial_ir: fix a Kernel crash during boot on Kernel 4.11-rc1, due to an IRQ code called too early - other IR regression fixes at lirc and at the raw IR decoding - a deadlock fix at the RC nuvoton driver - fix another issue with DMA on stack at dw2102 driver There's an extra patch there that change a driver interface for the SoC VSP1 driver, with is shared between the DRM and V4L2 driver. The patch itself is trivial, and was acked by David Arlie" * tag 'media/v4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: [media] v4l: vsp1: Adapt vsp1_du_setup_lif() interface to use a structure [media] dw2102: don't do DMA on stack [media] rc: protocol is not set on register for raw IR devices [media] rc: raw decoder for keymap protocol is not loaded on register [media] rc: nuvoton: fix deadlock in nvt_write_wakeup_codes [media] lirc: fix dead lock between open and wakeup_filter [media] serial_ir: ensure we're ready to receive interrupts

Linus Torvalds committed 9 years ago

Commit bb61ce52 parents cb2113c 8c71fff8 files · +260 −196Browse files

Showing the changes to drivers/media/rc/lirc_dev.c (1 of 8 files). Show all

Unified · Split

drivers/media/rc/lirc_dev.c+2−2
@@ -436,6 +436,8 @@ int lirc_dev_fop_open(struct inode *inode, struct file *file) · 435 unmodified lines
436 return -ERESTARTSYS;436 return -ERESTARTSYS;
437 437
438 ir = irctls[iminor(inode)];438 ir = irctls[iminor(inode)];
439 mutex_unlock(&lirc_dev_lock);
440
439 if (!ir) {441 if (!ir) {
440 retval = -ENODEV;442 retval = -ENODEV;
441 goto error;443 goto error;
@@ -476,8 +478,6 @@ int lirc_dev_fop_open(struct inode *inode, struct file *file) · 34 unmodified lines
476 }478 }
477 479
478error:480error:
479 mutex_unlock(&lirc_dev_lock);
480
481 nonseekable_open(inode, file);481 nonseekable_open(inode, file);
482 482
483 return retval;483 return retval;