diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-01-07 10:18:49 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-01-07 10:18:49 +1100 |
| commit | 7f9cb6998744fd2ab4ae6ed7887e2ede1e449fc3 (patch) | |
| tree | bf288343fc7c4ffa1636a873078fee5b04c848f6 /drivers/media | |
| parent | 8ef1957824d7466fd14ea61398ac95db3e310c8d (diff) | |
| parent | fe31e69740eddc7316071ed5165fed6703c8cd12 (diff) | |
Merge remote branch 'pci/linux-next'
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/cafe_ccic.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c index 0dfff50891e4..737bb877e962 100644 --- a/drivers/media/video/cafe_ccic.c +++ b/drivers/media/video/cafe_ccic.c @@ -2186,9 +2186,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) { |