diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 14:55:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 14:55:50 -0700 |
| commit | 61cca8c72eb284e80876bafdea057055f6e793e4 (patch) | |
| tree | 5bb92477b811e64e88c9f0c119acb2c9e9804c91 /drivers/net/wan/farsync.c | |
| parent | e494f6333bef20fd9d8689062260c5d0136a3ea0 (diff) | |
| parent | e254e9bff5283aad1af6d74d2a312ee011b84d61 (diff) | |
Merge 'upstream' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/wan/farsync.c')
| -rw-r--r-- | drivers/net/wan/farsync.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c index 7575b799ce5..7217d44e885 100644 --- a/drivers/net/wan/farsync.c +++ b/drivers/net/wan/farsync.c @@ -981,6 +981,7 @@ fst_issue_cmd(struct fst_port_info *port, unsigned short cmd) /* Wait for any previous command to complete */ while (mbval > NAK) { spin_unlock_irqrestore(&card->card_lock, flags); + set_current_state(TASK_UNINTERRUPTIBLE); schedule_timeout(1); spin_lock_irqsave(&card->card_lock, flags); |