diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 09:52:48 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 09:52:48 -0500 |
| commit | f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544 (patch) | |
| tree | 4c7abed6047538c13dd024a8ecffd15f31b4609a /drivers/net/sfc/mcdi.c | |
| parent | 84549d239ab9bb2e3a85c6efcf0e6478a38b4260 (diff) | |
| parent | 40aa7030e5213a43e9e0554fd7f95534ea310bf3 (diff) | |
Merge branch 'for-2.6.33' into for-2.6.34
Diffstat (limited to 'drivers/net/sfc/mcdi.c')
| -rw-r--r-- | drivers/net/sfc/mcdi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/sfc/mcdi.c b/drivers/net/sfc/mcdi.c index 683353b904c..0d4eba7266e 100644 --- a/drivers/net/sfc/mcdi.c +++ b/drivers/net/sfc/mcdi.c | |||
| @@ -142,8 +142,9 @@ static int efx_mcdi_poll(struct efx_nic *efx) | |||
| 142 | if (spins != 0) { | 142 | if (spins != 0) { |
| 143 | --spins; | 143 | --spins; |
| 144 | udelay(1); | 144 | udelay(1); |
| 145 | } else | 145 | } else { |
| 146 | schedule(); | 146 | schedule_timeout_uninterruptible(1); |
| 147 | } | ||
| 147 | 148 | ||
| 148 | time = get_seconds(); | 149 | time = get_seconds(); |
| 149 | 150 | ||