aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorunsik Kim <donari75@gmail.com>2009-07-28 02:52:06 -0400
committerJens Axboe <jens.axboe@oracle.com>2009-07-28 02:52:06 -0400
commit48f5690d45b79ffeedc5ab24243b576056f1d2ff (patch)
tree34010dcc736a4357c70edd5c3a7cd8b7bd5d1481 /drivers/block
parent4733fd328f14280900435d9dbae1487d110a4d56 (diff)
mg_disk: remove prohibited sleep operation
mflash's polling driver operate in standard request_fn_proc's context, sleep in this isn't permitted. Signed-off-by: unsik Kim <donari75@gmail.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/mg_disk.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/block/mg_disk.c b/drivers/block/mg_disk.c
index f703f5478246..5b120eab2baa 100644
--- a/drivers/block/mg_disk.c
+++ b/drivers/block/mg_disk.c
@@ -245,8 +245,6 @@ static unsigned int mg_wait(struct mg_host *host, u32 expect, u32 msec)
245 mg_dump_status("not ready", status, host); 245 mg_dump_status("not ready", status, host);
246 return MG_ERR_INV_STAT; 246 return MG_ERR_INV_STAT;
247 } 247 }
248 if (prv_data->use_polling)
249 msleep(1);
250 248
251 status = inb((unsigned long)host->dev_base + MG_REG_STATUS); 249 status = inb((unsigned long)host->dev_base + MG_REG_STATUS);
252 } while (time_before(cur_jiffies, expire)); 250 } while (time_before(cur_jiffies, expire));