Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 127259
b: refs/heads/master
c: 4ec06d6
h: refs/heads/master
i:
  127257: 13932bc
  127255: 5dfa30c
v: v3
  • Loading branch information
Alan Stern authored and Greg Kroah-Hartman committed Jan 7, 2009
1 parent d8f01aa commit 01b4556
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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: 3cb22d658668234edbe6dcb165501e9ef0c0a059
refs/heads/master: 4ec06d629628b6e5c7ff50d349a26ef5c35696e3
4 changes: 2 additions & 2 deletions trunk/drivers/usb/core/driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -1111,7 +1111,7 @@ static int autosuspend_check(struct usb_device *udev, int reschedule)
if (reschedule) {
if (!timer_pending(&udev->autosuspend.timer)) {
queue_delayed_work(ksuspend_usb_wq, &udev->autosuspend,
round_jiffies_relative(suspend_time - j));
round_jiffies_up_relative(suspend_time - j));
}
return -EAGAIN;
}
Expand Down Expand Up @@ -1553,7 +1553,7 @@ void usb_autopm_put_interface_async(struct usb_interface *intf)
else if (intf->pm_usage_cnt <= 0 &&
!timer_pending(&udev->autosuspend.timer)) {
queue_delayed_work(ksuspend_usb_wq, &udev->autosuspend,
round_jiffies_relative(
round_jiffies_up_relative(
udev->autosuspend_delay));
}
}
Expand Down

0 comments on commit 01b4556

Please sign in to comment.