diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-10-09 19:00:54 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-10-09 19:00:54 +0200 |
| commit | a66d05d504a24894a8fdf11e4569752f313e5764 (patch) | |
| tree | 2bb40c1f6c301b231d7aeaad08c190aa5a82ba1f /drivers/media/rc/ite-cir.c | |
| parent | Linux 3.17 (diff) | |
| parent | [media] ir-hix5hd2: fix build on c6x arch (diff) | |
| download | linux-a66d05d504a24894a8fdf11e4569752f313e5764.tar.xz linux-a66d05d504a24894a8fdf11e4569752f313e5764.zip | |
Merge branch 'patchwork' into v4l_for_linus
* patchwork: (544 commits)
[media] ir-hix5hd2: fix build on c6x arch
[media] pt3: fix DTV FE I2C driver load error paths
Revert "[media] media: em28xx - remove reset_resume interface"
[media] exynos4-is: fix some warnings when compiling on arm64
[media] usb drivers: use %zu instead of %zd
[media] pci drivers: use %zu instead of %zd
[media] dvb-frontends: use %zu instead of %zd
[media] s5p-mfc: Fix several printk warnings
[media] s5p_mfc_opr: Fix warnings
[media] ti-vpe: Fix typecast
[media] s3c-camif: fix dma_addr_t printks
[media] s5p_mfc_opr_v6: get rid of warnings when compiled with 64 bits
[media] s5p_mfc_opr_v5: Fix lots of warnings on x86_64
[media] em28xx: Fix identation
[media] drxd: remove a dead code
[media] saa7146: remove return after BUG()
[media] cx88: remove return after BUG()
[media] cx88: fix cards table CodingStyle
[media] radio-sf16fmr2: declare some structs as static
[media] radio-sf16fmi: declare pnp_attached as static
...
Conflicts:
Documentation/DocBook/media/v4l/compat.xml
Diffstat (limited to 'drivers/media/rc/ite-cir.c')
| -rw-r--r-- | drivers/media/rc/ite-cir.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/rc/ite-cir.c b/drivers/media/rc/ite-cir.c index 447fe35862dc..56abf9120cc2 100644 --- a/drivers/media/rc/ite-cir.c +++ b/drivers/media/rc/ite-cir.c @@ -1666,7 +1666,6 @@ static int ite_suspend(struct pnp_dev *pdev, pm_message_t state) static int ite_resume(struct pnp_dev *pdev) { - int ret = 0; struct ite_dev *dev = pnp_get_drvdata(pdev); unsigned long flags; @@ -1681,7 +1680,7 @@ static int ite_resume(struct pnp_dev *pdev) spin_unlock_irqrestore(&dev->lock, flags); - return ret; + return 0; } static void ite_shutdown(struct pnp_dev *pdev) |