From: Trent Piepho <xyzzy@speakeasy.org>
Date: Wed, 25 Apr 2007 03:20:13 +0000 (-0300)
Subject: V4L/DVB (5557): Cafe_ccic: check return value of pci_enable_device
X-Git-Tag: v2.6.22-rc1~1118^2~4
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12df2f54e5522d89b3de6df62a800a0edeb10dcc;p=linux-2.6

V4L/DVB (5557): Cafe_ccic: check return value of pci_enable_device

Remove warnings

Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Acked-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---

diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
index 59fd760a52..96254dbaf6 100644
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
@@ -2216,7 +2216,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);