projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mac80211-next-for-john-2014-11-04' of git://git.kernel.org/pub/scm/linux...
[cascardo/linux.git]
/
drivers
/
media
/
rc
/
ite-cir.c
diff --git
a/drivers/media/rc/ite-cir.c
b/drivers/media/rc/ite-cir.c
index
447fe35
..
56abf91
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)