Skip to content

Commit

Permalink
USB: utilize round_jiffies_up_relative()
Browse files Browse the repository at this point in the history
This patch (as1178) uses the new round_jiffies_up_relative() routine
for setting the autosuspend delayed_work timer.  It's appropriate
since we don't care too much about the exact length of the delay, but
we don't want it to be too short (rounded down).

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Alan Stern authored and Greg Kroah-Hartman committed Jan 7, 2009
1 parent 3cb22d6 commit 4ec06d6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions 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 4ec06d6

Please sign in to comment.