Bläddra i källkod

[BNX2]: Use msleep().

bnx2.c (incorrectly) sets current->state directly to
TASK_UNINTERRUPTIBLE, without going through set_task_state(). However
all the code wants to do is an msleep so just make it do that instead...

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Acked-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Arjan van de Ven 18 år sedan
förälder
incheckning
8e54588161
1 ändrade filer med 2 tillägg och 4 borttagningar
  1. 2 4
      drivers/net/bnx2.c

+ 2 - 4
drivers/net/bnx2.c

@@ -3935,10 +3935,8 @@ bnx2_reset_chip(struct bnx2 *bp, u32 reset_code)
 		REG_WR(bp, BNX2_PCICFG_MISC_CONFIG, val);
 		REG_WR(bp, BNX2_PCICFG_MISC_CONFIG, val);
 
 
 		if ((CHIP_ID(bp) == CHIP_ID_5706_A0) ||
 		if ((CHIP_ID(bp) == CHIP_ID_5706_A0) ||
-		    (CHIP_ID(bp) == CHIP_ID_5706_A1)) {
-			current->state = TASK_UNINTERRUPTIBLE;
-			schedule_timeout(HZ / 50);
-		}
+		    (CHIP_ID(bp) == CHIP_ID_5706_A1))
+			msleep(20);
 
 
 		/* Reset takes approximate 30 usec */
 		/* Reset takes approximate 30 usec */
 		for (i = 0; i < 10; i++) {
 		for (i = 0; i < 10; i++) {