From 5e226e830355870812b4fec934b7ea4adb2a7c15 Mon Sep 17 00:00:00 2001 From: Alexey Dobriyan Date: Tue, 23 Sep 2003 02:57:21 -0700 Subject: [PATCH] [PATCH] USB: Remove setting TASK_RUNNING after schedule_timeout in /drivers/usb/ --- drivers/usb/host/uhci-hcd.c | 2 -- drivers/usb/serial/digi_acceleport.c | 2 -- drivers/usb/storage/transport.c | 1 - 3 files changed, 5 deletions(-) diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c index b1cb550cbb476..6e6b4424e0304 100644 --- a/drivers/usb/host/uhci-hcd.c +++ b/drivers/usb/host/uhci-hcd.c @@ -1965,13 +1965,11 @@ static void reset_hc(struct uhci_hcd *uhci) outw(USBCMD_GRESET, io_addr + USBCMD); set_current_state(TASK_UNINTERRUPTIBLE); schedule_timeout((HZ*50+999) / 1000); - set_current_state(TASK_RUNNING); outw(0, io_addr + USBCMD); /* Another 10ms delay */ set_current_state(TASK_UNINTERRUPTIBLE); schedule_timeout((HZ*10+999) / 1000); - set_current_state(TASK_RUNNING); uhci->resume_detect = 0; } diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c index d9abf8afdcad8..07f227d3c64d7 100644 --- a/drivers/usb/serial/digi_acceleport.c +++ b/drivers/usb/serial/digi_acceleport.c @@ -594,8 +594,6 @@ static inline long cond_wait_interruptible_timeout_irqrestore( timeout = schedule_timeout(timeout); - set_current_state( TASK_RUNNING ); - remove_wait_queue( q, &wait ); return( timeout ); diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c index 81e6c62a28eef..abbb98ce53e3c 100644 --- a/drivers/usb/storage/transport.c +++ b/drivers/usb/storage/transport.c @@ -1074,7 +1074,6 @@ static int usb_stor_reset_common(struct us_data *us, up(&us->dev_semaphore); set_current_state(TASK_UNINTERRUPTIBLE); schedule_timeout(HZ*6); - set_current_state(TASK_RUNNING); down(&us->dev_semaphore); if (test_bit(US_FLIDX_DISCONNECTING, &us->flags)) { US_DEBUGP("Reset interrupted by disconnect\n"); -- 2.53.0