aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/memstick
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/memstick')
-rw-r--r--drivers/memstick/core/mspro_block.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c
index aa5ac6efd9b..d3f1a087ece 100644
--- a/drivers/memstick/core/mspro_block.c
+++ b/drivers/memstick/core/mspro_block.c
@@ -1339,13 +1339,14 @@ static void mspro_block_remove(struct memstick_dev *card)
1339 struct mspro_block_data *msb = memstick_get_drvdata(card); 1339 struct mspro_block_data *msb = memstick_get_drvdata(card);
1340 unsigned long flags; 1340 unsigned long flags;
1341 1341
1342 del_gendisk(msb->disk);
1343 dev_dbg(&card->dev, "mspro block remove\n");
1344 spin_lock_irqsave(&msb->q_lock, flags); 1342 spin_lock_irqsave(&msb->q_lock, flags);
1345 msb->eject = 1; 1343 msb->eject = 1;
1346 blk_start_queue(msb->queue); 1344 blk_start_queue(msb->queue);
1347 spin_unlock_irqrestore(&msb->q_lock, flags); 1345 spin_unlock_irqrestore(&msb->q_lock, flags);
1348 1346
1347 del_gendisk(msb->disk);
1348 dev_dbg(&card->dev, "mspro block remove\n");
1349
1349 blk_cleanup_queue(msb->queue); 1350 blk_cleanup_queue(msb->queue);
1350 msb->queue = NULL; 1351 msb->queue = NULL;
1351 1352