Merge tag 'v3.19-rc4' into next

[mirror_ubuntu-artful-kernel.git] / drivers / media / rc / ite-cir.c

diff --git a/drivers/media/rc/ite-cir.c b/drivers/media/rc/ite-cir.c
index 447fe35862dc2d5ad00cce91eb7fd61edaf9e4b5..56abf9120cc27491d20857958fa10b1111ce573e 100644 (file)
--- 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)