git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
[pandora-kernel.git]
/
drivers
/
media
/
video
/
cafe_ccic.c
diff --git
a/drivers/media/video/cafe_ccic.c
b/drivers/media/video/cafe_ccic.c
index
789087c
..
49f1b8f
100644
(file)
--- a/
drivers/media/video/cafe_ccic.c
+++ b/
drivers/media/video/cafe_ccic.c
@@
-2184,9
+2184,7
@@
static int cafe_pci_resume(struct pci_dev *pdev)
struct cafe_camera *cam = to_cam(v4l2_dev);
int ret = 0;
- ret = pci_restore_state(pdev);
- if (ret)
- return ret;
+ pci_restore_state(pdev);
ret = pci_enable_device(pdev);
if (ret) {