Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 207955
b: refs/heads/master
c: 16be572
h: refs/heads/master
i:
  207953: 3cad08c
  207951: 578e898
v: v3
  • Loading branch information
csanchez@neurowork.net authored and Greg Kroah-Hartman committed Aug 10, 2010
1 parent e3b9762 commit 85845bf
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e9c64f2b39d6861d5f3108ec135966349fc66adb
refs/heads/master: 16be57259f4e664e4e423caa896963de1b7b8d14
7 changes: 3 additions & 4 deletions trunk/drivers/usb/core/driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down Expand Up @@ -1786,15 +1785,15 @@ 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,
};

#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 */

Expand Down

0 comments on commit 85845bf

Please sign in to comment.