From 85845bf057fefdebbf02aff46c4ac8a7ac9ea1eb Mon Sep 17 00:00:00 2001 From: "csanchez@neurowork.net" Date: Tue, 25 May 2010 10:38:22 -0500 Subject: [PATCH] --- yaml --- r: 207955 b: refs/heads/master c: 16be57259f4e664e4e423caa896963de1b7b8d14 h: refs/heads/master i: 207953: 3cad08c8791859139e76dad658094d1b83bfb63a 207951: 578e8986e27cd821658caea14e115b119dfd07a7 v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/driver.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index dcd0d7210c15..106bdc793203 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9c64f2b39d6861d5f3108ec135966349fc66adb +refs/heads/master: 16be57259f4e664e4e423caa896963de1b7b8d14 diff --git a/trunk/drivers/usb/core/driver.c b/trunk/drivers/usb/core/driver.c index a6bd53ace035..880f65baf581 100644 --- a/trunk/drivers/usb/core/driver.c +++ b/trunk/drivers/usb/core/driver.c @@ -1742,9 +1742,8 @@ static int usb_runtime_suspend(struct device *dev) } /* Prevent the parent from suspending immediately after */ - else if (udev->parent) { + else if (udev->parent) udev->parent->last_busy = jiffies; - } } /* Runtime suspend for a USB interface doesn't mean anything. */ @@ -1786,7 +1785,7 @@ static int usb_runtime_idle(struct device *dev) return 0; } -static struct dev_pm_ops usb_bus_pm_ops = { +static const struct dev_pm_ops usb_bus_pm_ops = { .runtime_suspend = usb_runtime_suspend, .runtime_resume = usb_runtime_resume, .runtime_idle = usb_runtime_idle, @@ -1794,7 +1793,7 @@ static struct dev_pm_ops usb_bus_pm_ops = { #else -#define usb_bus_pm_ops (*(struct dev_pm_ops *) NULL) +#define usb_bus_pm_ops (*(const struct dev_pm_ops *) NULL) #endif /* CONFIG_USB_SUSPEND */