From: Alan Stern <stern@rowland.harvard.edu>
Date: Wed, 1 Feb 2006 15:47:11 +0000 (-0500)
Subject: [PATCH] usbcore: fix compile error with CONFIG_USB_SUSPEND=n
X-Git-Tag: v2.6.17-rc1~1176^2~34
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43c5d5aaafef56618a6efbcab7f91615da1a8659;p=linux-2.6

[PATCH] usbcore: fix compile error with CONFIG_USB_SUSPEND=n

This patch (as647) fixes a small error introduced by a recent change to
the USB core suspend/resume code.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index f1d64d4bbf..7dd28f8e1c 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1892,8 +1892,8 @@ int usb_resume_device(struct usb_device *udev)
 			status = hub_port_resume(hdev_to_hub(udev->parent),
 					udev->portnum, udev);
 		} else
-			status = 0;
 #endif
+			status = 0;
 	} else
 		status = finish_device_resume(udev);
 	if (status < 0)