From 908ea8c72ffb24fbcb09bd1fda7ec50125f00617 Mon Sep 17 00:00:00 2001 From: Chen Gang Date: Mon, 1 Apr 2013 13:04:08 +0800 Subject: [PATCH] --- yaml --- r: 364515 b: refs/heads/master c: 505bdbc79d20f8f2a56c02498f079bb23b0ef756 h: refs/heads/master i: 364513: 262534ef73c9ea7656b00cc68cc825b79d20c61a 364511: c67b125c0a52a7311137df768d7247c56c3e8acf v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/driver.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8317f3c366df..8a8e9a1e954d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8e277d7cfae470b76eb955f6ee9aa32d111bf5ae +refs/heads/master: 505bdbc79d20f8f2a56c02498f079bb23b0ef756 diff --git a/trunk/drivers/usb/core/driver.c b/trunk/drivers/usb/core/driver.c index 84d2b0585810..6eab440e1542 100644 --- a/trunk/drivers/usb/core/driver.c +++ b/trunk/drivers/usb/core/driver.c @@ -1253,10 +1253,12 @@ static int usb_suspend_both(struct usb_device *udev, pm_message_t msg) /* If the suspend failed, resume interfaces that did get suspended */ if (status != 0) { - msg.event ^= (PM_EVENT_SUSPEND | PM_EVENT_RESUME); - while (++i < n) { - intf = udev->actconfig->interface[i]; - usb_resume_interface(udev, intf, msg, 0); + if (udev->actconfig) { + msg.event ^= (PM_EVENT_SUSPEND | PM_EVENT_RESUME); + while (++i < n) { + intf = udev->actconfig->interface[i]; + usb_resume_interface(udev, intf, msg, 0); + } } /* If the suspend succeeded then prevent any more URB submissions