[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-id: <1446812535-10567-2-git-send-email-vishnu.ps@samsung.com>
Date: Fri, 06 Nov 2015 17:52:09 +0530
From: Vishnu Pratap Singh <vishnu.ps@...sung.com>
To: axboe@...nel.dk, akpm@...ux-foundation.org,
linux-kernel@...r.kernel.org, jmoyer@...hat.com,
minchan@...nel.org, ngupta@...are.org,
sergey.senozhatsky.work@...il.com, davem@...emloft.net,
neilb@...e.com, ulf.hansson@...aro.org, tiwai@...e.de,
hare@...e.de, ming.lei@...onical.com, jarod@...hat.com,
viro@...iv.linux.org.uk, tj@...nel.org, adrian.hunter@...el.com,
jonathanh@...dia.com, grundler@...omium.org,
linux-ide@...r.kernel.org, linux-raid@...r.kernel.org,
linux-mmc@...r.kernel.org
Cc: cpgs@...sung.com, vishu13285@...il.com, pintu.k@...sung.com,
rohit.kr@...sung.com, Vishnu Pratap Singh <vishnu.ps@...sung.com>
Subject: [PATCH 2/8] mmc: handle add_disk() return value
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.
Verfied on X86 based ubuntu machine.
This patch depends on [PATCH 1/8] block/genhd.c: Add error handling
Signed-off-by: Vishnu Pratap Singh <vishnu.ps@...sung.com>
---
drivers/mmc/card/block.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
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;
}
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists