Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media updates from Mauro Carvalho Chehab:
 - some V4L2 API updates needed by embedded devices
 - DVB API extensions for ATSC-MH delivery system, used in US for mobile
   TV
 - new tuners for fc0011/0012/0013 and tua9001
 - a new dvb driver for af9033/9035
 - a new ATSC-MH frontend (lg2160)
 - new remote controller keymaps
 - Removal of a few legacy webcam driver that got replaced by gspca on
   several kernel versions ago
 - a new driver for Exynos 4/5 webcams(s5pp fimc-lite)
 - a new webcam sensor driver (smiapp)
 - a new video input driver for embedded (sta2x1xx)
 - several improvements, fixes, cleanups, etc inside the drivers.

Manually fix up conflicts due to err() -> dev_err() conversion in
drivers/staging/media/easycap/easycap_main.c

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (484 commits)
  [media] saa7134-cards: Remove a PCI entry added by mistake
  [media] radio-sf16fmi: add support for SF16-FMD
  [media] rc-loopback: remove duplicate line
  [media] patch for Asus My Cinema PS3-100 (1043:48cd)
  [media] au0828: Move the Kconfig knob under V4L_USB_DRIVERS
  [media] em28xx: simple comment fix
  [media] [resend] radio-sf16fmr2: add PnP support for SF16-FMD2
  [media] smiapp: Use v4l2_ctrl_new_int_menu() instead of v4l2_ctrl_new_custom()
  [media] smiapp: Add support for 8-bit uncompressed formats
  [media] smiapp: Allow generic quirk registers
  [media] smiapp: Use non-binning limits if the binning limit is zero
  [media] smiapp: Initialise rval in smiapp_read_nvm()
  [media] smiapp: Round minimum pre_pll up rather than down in ip_clk_freq check
  [media] smiapp: Use 8-bit reads only before identifying the sensor
  [media] smiapp: Quirk for sensors that only do 8-bit reads
  [media] smiapp: Pass struct sensor to register writing commands instead of i2c_client
  [media] smiapp: Allow using external clock from the clock framework
  [media] zl10353: change .read_snr() to report SNR as a 0.1 dB
  [media] media: add support to gspca/pac7302.c for 093a:2627 (Genius FaceCam 300)
  [media] m88rs2000 - only flip bit 2 on reg 0x70 on 16th try
  ...

1 files changed, 12 insertions, 14 deletions

diff --git a/drivers/media/rc/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c
index 8b2c071ac0ab..dc8a7dddccd4 100644
--- a/drivers/media/rc/nuvoton-cir.c
+++ b/drivers/media/rc/nuvoton-cir.c
@@ -1075,19 +1075,19 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
 
         if (request_irq(nvt->cir_irq, nvt_cir_isr, IRQF_SHARED,
                         NVT_DRIVER_NAME, (void *)nvt))
-                goto failure;
+                goto failure2;
 
         if (!request_region(nvt->cir_wake_addr,
                             CIR_IOREG_LENGTH, NVT_DRIVER_NAME))
-                goto failure;
+                goto failure3;
 
         if (request_irq(nvt->cir_wake_irq, nvt_cir_wake_isr, IRQF_SHARED,
                         NVT_DRIVER_NAME, (void *)nvt))
-                goto failure;
+                goto failure4;
 
         ret = rc_register_device(rdev);
         if (ret)
-                goto failure;
+                goto failure5;
 
         device_init_wakeup(&pdev->dev, true);
         nvt->rdev = rdev;
@@ -1099,17 +1099,15 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
 
         return 0;
 
+failure5:
+        free_irq(nvt->cir_wake_irq, nvt);
+failure4:
+        release_region(nvt->cir_wake_addr, CIR_IOREG_LENGTH);
+failure3:
+        free_irq(nvt->cir_irq, nvt);
+failure2:
+        release_region(nvt->cir_addr, CIR_IOREG_LENGTH);
 failure:
-        if (nvt->cir_irq)
-                free_irq(nvt->cir_irq, nvt);
-        if (nvt->cir_addr)
-                release_region(nvt->cir_addr, CIR_IOREG_LENGTH);
-
-        if (nvt->cir_wake_irq)
-                free_irq(nvt->cir_wake_irq, nvt);
-        if (nvt->cir_wake_addr)
-                release_region(nvt->cir_wake_addr, CIR_IOREG_LENGTH);
-
         rc_free_device(rdev);
         kfree(nvt);