| Message ID | 1447045906-21307-1-git-send-email-vishnu.ps@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 23b6c8e..543c670 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -2432,7 +2432,10 @@ static int mmc_add_disk(struct mmc_blk_data *md) int ret; struct mmc_card *card = md->queue.card; - add_disk(md->disk); + ret = add_disk(md->disk); + if (ret) + goto add_disk_fail; + md->force_ro.show = force_ro_show; md->force_ro.store = force_ro_store; sysfs_attr_init(&md->force_ro.attr); @@ -2468,7 +2471,7 @@ power_ro_lock_fail: device_remove_file(disk_to_dev(md->disk), &md->force_ro); force_ro_fail: del_gendisk(md->disk); - +add_disk_fail: return ret; }
This patch handles add_disk() return value. Earlier add_disk() function doesn't handle error cases, now it is added, so the callers of this function should also handle it. Signed-off-by: Vishnu Pratap Singh <vishnu.ps@samsung.com> --- Verfied on X86 based ubuntu machine. --- This patch depends on [PATCH 1/8] block/genhd.c: Add error handling --- drivers/mmc/card/block.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)