diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-04-25 00:38:22 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-04-25 00:38:22 -0300 |
| commit | 54d44a36f1f7fc565e4a4bedeac90b3e6efbbf97 (patch) | |
| tree | 550e01434107e3f82546bfa2d6924cce0d59c35d /linux/drivers/media/video/cafe_ccic.c | |
| parent | 5f977b30505e5955712a505f5d074563baecba66 (diff) | |
| parent | 87e67f18a546d8461379f9f4df05102910f78c9a (diff) | |
| download | mediapointer-dvb-s2-54d44a36f1f7fc565e4a4bedeac90b3e6efbbf97.tar.gz mediapointer-dvb-s2-54d44a36f1f7fc565e4a4bedeac90b3e6efbbf97.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/opera
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cafe_ccic.c')
| -rw-r--r-- | linux/drivers/media/video/cafe_ccic.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cafe_ccic.c b/linux/drivers/media/video/cafe_ccic.c index ea69590a1..041d87092 100644 --- a/linux/drivers/media/video/cafe_ccic.c +++ b/linux/drivers/media/video/cafe_ccic.c @@ -2222,7 +2222,11 @@ static int cafe_pci_resume(struct pci_dev *pdev) ret = pci_restore_state(pdev); if (ret) return ret; - pci_enable_device(pdev); + ret = pci_enable_device(pdev); + if (ret) { + cam_warn(cam, "Unable to re-enable device on resume!\n"); + return ret; + } cafe_ctlr_init(cam); cafe_ctlr_power_up(cam); set_bit(CF_CONFIG_NEEDED, &cam->flags); |