memstick/ms_block: Add check for alloc_ordered_workqueue

[linux-2.6-block.git] / drivers / memstick / core / ms_block.c

diff --git a/drivers/memstick/core/ms_block.c b/drivers/memstick/core/ms_block.c
index ba8414519515892253fb64ae8a7eeb1e9c830a07..04115cd92433bfb9134708f0e3373bb21baa7c19 100644 (file)
--- a/drivers/memstick/core/ms_block.c
+++ b/drivers/memstick/core/ms_block.c
@@ -2116,6 +2116,11 @@ static int msb_init_disk(struct memstick_dev *card)
        dbg("Set total disk size to %lu sectors", capacity);
 
        msb->io_queue = alloc_ordered_workqueue("ms_block", WQ_MEM_RECLAIM);
+       if (!msb->io_queue) {
+               rc = -ENOMEM;
+               goto out_cleanup_disk;
+       }
+
        INIT_WORK(&msb->io_work, msb_io_work);
        sg_init_table(msb->prealloc_sg, MS_BLOCK_MAX_SEGS+1);
 
@@ -2125,10 +2130,12 @@ static int msb_init_disk(struct memstick_dev *card)
        msb_start(card);
        rc = device_add_disk(&card->dev, msb->disk, NULL);
        if (rc)
-               goto out_cleanup_disk;
+               goto out_destroy_workqueue;
        dbg("Disk added");
        return 0;
 
+out_destroy_workqueue:
+       destroy_workqueue(msb->io_queue);
 out_cleanup_disk:
        put_disk(msb->disk);
 out_free_tag_set: