summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2014-09-24 14:06:03 +0200
committerMarek Vasut <marex@denx.de>2014-11-04 06:04:00 +0100
commit32f2eac1e02c55bd0e948b28dd3bda5950f56f57 (patch)
treeeeb6d64146c3cbc938f7c1209127ab0db6e3a375
parent0834bb2fb0664e02140cd09fb1e06c0d4c60095a (diff)
downloadblackbird-obmc-uboot-32f2eac1e02c55bd0e948b28dd3bda5950f56f57.tar.gz
blackbird-obmc-uboot-32f2eac1e02c55bd0e948b28dd3bda5950f56f57.zip
usb: ehci: Do not disable an already disabled periodic schedule
When periodic_schedules == 0, the schedule is disabled and there is no reason to disable it again. Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-rw-r--r--drivers/usb/host/ehci-hcd.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 936d006ba4..55f4436beb 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1249,9 +1249,11 @@ create_int_queue(struct usb_device *dev, unsigned long pipe, int queuesize,
ALIGN_END_ADDR(struct qTD, result->tds,
queuesize));
- if (disable_periodic(ctrl) < 0) {
- debug("FATAL: periodic should never fail, but did");
- goto fail3;
+ if (ctrl->periodic_schedules > 0) {
+ if (disable_periodic(ctrl) < 0) {
+ debug("FATAL: periodic should never fail, but did");
+ goto fail3;
+ }
}
/* hook up to periodic list */
OpenPOWER on IntegriCloud