From 18738792537e26d162ccbb9c41c5106f9451494e Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sat, 2 May 2009 08:12:36 -0300
Subject: [PATCH] --- yaml --- r: 144783 b: refs/heads/master c:
 7564f67d5b38eb814e67edd8ba0c70fd8eb475b6 h: refs/heads/master i:   144781:
 9ccbea3f9e5742bc4f253444d0cbe6a28193228e   144779:
 ba996423bb30479b197dd3555b78d3b30d370863   144775:
 8d63a1de547a4d0a1017ef3a780ed025e5f40631   144767:
 34d124dd47b5027b79ce965889f9469d8ccf353b v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/media/video/uvc/uvc_driver.c | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 63f4628eccce..c3909ad2cd95 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34a7864db1bc6d9ceb466251957fccf90c7106f8
+refs/heads/master: 7564f67d5b38eb814e67edd8ba0c70fd8eb475b6
diff --git a/trunk/drivers/media/video/uvc/uvc_driver.c b/trunk/drivers/media/video/uvc/uvc_driver.c
index 399412d7f020..507dc85646b2 100644
--- a/trunk/drivers/media/video/uvc/uvc_driver.c
+++ b/trunk/drivers/media/video/uvc/uvc_driver.c
@@ -1726,14 +1726,17 @@ static int uvc_suspend(struct usb_interface *intf, pm_message_t message)
 static int __uvc_resume(struct usb_interface *intf, int reset)
 {
 	struct uvc_device *dev = usb_get_intfdata(intf);
-	int ret;
 
 	uvc_trace(UVC_TRACE_SUSPEND, "Resuming interface %u\n",
 		intf->cur_altsetting->desc.bInterfaceNumber);
 
 	if (intf->cur_altsetting->desc.bInterfaceSubClass == SC_VIDEOCONTROL) {
-		if (reset && (ret = uvc_ctrl_resume_device(dev)) < 0)
-			return ret;
+		if (reset) {
+			int ret = uvc_ctrl_resume_device(dev);
+
+			if (ret < 0)
+				return ret;
+		}
 
 		return uvc_status_resume(dev);
 	}