diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:30:29 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:30:29 -0400 |
commit | 35ebbae2836a361330b784706b7140c90a346a53 (patch) | |
tree | ada3c046a8b6bfdf21bcb0932b4b65c95c2af073 /drivers/net/ns83820.c | |
parent | c6a33e2464edd87f8c12cc2d11369a5b44c65b77 (diff) | |
parent | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff) |
Merge branch 'master'
Diffstat (limited to 'drivers/net/ns83820.c')
-rw-r--r-- | drivers/net/ns83820.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c index e4811b42a6b..a3c3fc9c0d8 100644 --- a/drivers/net/ns83820.c +++ b/drivers/net/ns83820.c @@ -1632,8 +1632,7 @@ static void ns83820_run_bist(struct net_device *ndev, const char *name, u32 enab timed_out = 1; break; } - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(1); + schedule_timeout_uninterruptible(1); } if (status & fail) |