From 01b4556c64578a37fcaffa64f9fa321bcf3d234f Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Tue, 25 Nov 2008 16:40:02 -0500 Subject: [PATCH] --- yaml --- r: 127259 b: refs/heads/master c: 4ec06d629628b6e5c7ff50d349a26ef5c35696e3 h: refs/heads/master i: 127257: 13932bcdd6776f550afd1f9dac4eabf4ade0389c 127255: 5dfa30c401b0f856016afa8dba2136166d3351f3 v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/driver.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 74c2d4c547af..12032d0d2c94 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3cb22d658668234edbe6dcb165501e9ef0c0a059 +refs/heads/master: 4ec06d629628b6e5c7ff50d349a26ef5c35696e3 diff --git a/trunk/drivers/usb/core/driver.c b/trunk/drivers/usb/core/driver.c index 7e26fb3c2759..0226e019326a 100644 --- a/trunk/drivers/usb/core/driver.c +++ b/trunk/drivers/usb/core/driver.c @@ -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; } @@ -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)); } }