summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2006-02-01 10:47:11 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2006-03-20 14:49:58 -0800
commit43c5d5aaafef56618a6efbcab7f91615da1a8659 (patch)
treef3b0203e803b4b03a976cd3c8cb4d02f974e0f87 /drivers/usb
parent6a8e87b23ff4a979bde5451a242466a4b3f9fe7d (diff)
downloadtalos-op-linux-43c5d5aaafef56618a6efbcab7f91615da1a8659.tar.gz
talos-op-linux-43c5d5aaafef56618a6efbcab7f91615da1a8659.zip
[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>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/core/hub.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index f1d64d4bbf5f..7dd28f8e1cea 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)
OpenPOWER on IntegriCloud