From patchwork Mon Nov 9 05:11:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "vishnu.ps" X-Patchwork-Id: 7580891 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 79EF49F2E9 for ; Mon, 9 Nov 2015 05:13:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9582B20774 for ; Mon, 9 Nov 2015 05:13:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7A42A2077B for ; Mon, 9 Nov 2015 05:13:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750798AbbKIFM7 (ORCPT ); Mon, 9 Nov 2015 00:12:59 -0500 Received: from mailout1.samsung.com ([203.254.224.24]:50455 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750767AbbKIFM5 (ORCPT ); Mon, 9 Nov 2015 00:12:57 -0500 Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NXJ001977TJVN50@mailout1.samsung.com>; Mon, 09 Nov 2015 14:12:55 +0900 (KST) Received: from epcpsbgm2new.samsung.com ( [172.20.52.125]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id 12.44.05385.65B20465; Mon, 9 Nov 2015 14:12:55 +0900 (KST) X-AuditID: cbfee691-f79d66d000001509-fa-56402b56a6bd Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2new.samsung.com (EPCPMTA) with SMTP id 3F.57.18629.65B20465; Mon, 9 Nov 2015 14:12:54 +0900 (KST) Received: from vishnu-ubuntu.sisodomain.com ([107.108.218.62]) by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NXJ000HM7RKA4T0@mmp1.samsung.com>; Mon, 09 Nov 2015 14:12:54 +0900 (KST) From: Vishnu Pratap Singh To: axboe@kernel.dk, akpm@linux-foundation.org, linux-kernel@vger.kernel.org, jmoyer@redhat.com, minchan@kernel.org, ngupta@vflare.org, sergey.senozhatsky.work@gmail.com, davem@davemloft.net, neilb@suse.com, ulf.hansson@linaro.org, tiwai@suse.de, hare@suse.de, ming.lei@canonical.com, jarod@redhat.com, viro@zeniv.linux.org.uk, tj@kernel.org, adrian.hunter@intel.com, jonathanh@nvidia.com, grundler@chromium.org, linux-ide@vger.kernel.org, linux-raid@vger.kernel.org, linux-mmc@vger.kernel.org Cc: cpgs@samsung.com, vishu13285@gmail.com, pintu.k@samsung.com, rohit.kr@samsung.com, Vishnu Pratap Singh Subject: [PATCH 2/8] mmc: handle add_disk() return value Date: Mon, 09 Nov 2015 10:41:46 +0530 Message-id: <1447045906-21307-1-git-send-email-vishnu.ps@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1446812535-10567-2-git-send-email-vishnu.ps@samsung.com> References: <1446812535-10567-2-git-send-email-vishnu.ps@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrMIsWRmVeSWpSXmKPExsWyRsSkVjdc2yHMoOMss8XJJ2vYLOasBxKr 7/azWbw8pGkx53wLi8WrIz+YLPYsmsRkMa3nEqPF2V9XWSxaZi1isTi24xGTxeVdc9gsjvzv Z7Ron7+L0WLZ1/fsFrsefme3+LQx1mJDyyx2i77vh9ktnje3slg8mgA05OXmN0wWv5YfZbQ4 vjbc4vzf46wWU/ruMlpsWfGQ1UHaY1ZDL5vH7IaLLB5bVt5k8tg56y67x+I9L5k8Lp8t9di0 qpPN4861PWweJ2b8ZvHobX7H5vF+31U2j74tqxg91m+5yuKx+XS1x85Pm1k9Pm+SCxCM4rJJ Sc3JLEst0rdL4MpouDefvaCJs2L7snWMDYz72bsYOTkkBEwktj6cBGWLSVy4t56ti5GLQ0hg BaPE7u6DcEU/uxaxQCSWMko8n9nGDOE0MUmcOz2BBaSKTcBQYsPsI+wgCRGB38wSMxb0gznM Ai2MElNPr2MCqRIWsJA4em8aK4jNIqAq0bt5OjOIzSvgKtHR8JsZYp+cxMljk4FqODg4Bdwk ls4ECwsBlfzpfw42U0LgB4fEmVfroeYISHybfIgFpF5CQFZi0wGoMZISB1fcYJnAKLyAkWEV o2hqQXJBcVJ6kalecWJucWleul5yfu4mRmBaOP3v2cQdjPcPWB9iFOBgVOLhjZhpHybEmlhW XJl7iNEUaMNEZinR5Hxg8skriTc0NjOyMDUxNTYytzRTEufVkf4ZLCSQnliSmp2aWpBaFF9U mpNafIiRiYNTqoGxy0Te7v/dyeEMhb88DVWjl8lusVxVrnR555TzL8/X/zokWq68/NuNVxZX G5TEoypz513QuymzTeKV/dr/h4KOubZN+lPKKN28VnJjcty5xr0JJd+stv6cfIv/s3SUoSnf 2fr/bFOa7S6KOh1fsFqriumg6q6yzT5PFJ+Wc0SbmU2dejJim7KUEktxRqKhFnNRcSIALIzX VAYDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrAKsWRmVeSWpSXmKPExsVy+t9jAd0wbYcwgzMLzC1OPlnDZjFnPZBY fbefzeLlIU2LOedbWCxeHfnBZLFn0SQmi2k9lxgtzv66ymLRMmsRi8WxHY+YLC7vmsNmceR/ P6NF+/xdjBbLvr5nt9j18Du7xaeNsRYbWmaxW/R9P8xu8by5lcXi0QSgIS83v2Gy+LX8KKPF 8bXhFuf/Hme1mNJ3l9Fiy4qHrA7SHrMaetk8ZjdcZPHYsvImk8fOWXfZPRbvecnkcflsqcem VZ1sHneu7WHzODHjN4tHb/M7No/3+66yefRtWcXosX7LVRaPzaerPXZ+2szq8XmTXIBgVAOj TUZqYkpqkUJqXnJ+SmZeuq2Sd3C8c7ypmYGhrqGlhbmSQl5ibqqtkotPgK5bZg4wdJQUyhJz SoFCAYnFxUr6dpgmhIa46VrANEbo+oYEwfUYGaCBhDWMGQ335rMXNHFWbF+2jrGBcT97FyMn h4SAicTPrkUsELaYxIV769m6GLk4hASWMko8n9nGDOE0MUmcOz0BrIpNwFBiw+wj7CAJEYHf zBIzFvSDOcwCLYwSU0+vYwKpEhawkDh6bxoriM0ioCrRu3k6M4jNK+Aq0dHwmxlin5zEyWOT gWo4ODgF3CSWzgQLCwGV/Ol/zj6BkXcBI8MqRonUguSC4qT0XKO81HK94sTc4tK8dL3k/NxN jODU80x6B+PhXe6HGAU4GJV4eBmm24cJsSaWFVfmHmKU4GBWEuE1Y3MIE+JNSaysSi3Kjy8q zUktPsRoCnTXRGYp0eR8YFrMK4k3NDYxNzU2tTSxMDGzVBLn1fc0ChMSSE8sSc1OTS1ILYLp Y+LglGpg3CL4kEfW17BX8lby8YRzVrsbj/YZsPu93RbK+tuktq//6OZ58dFdohcWnpuRfHLu Lfvk9qXJfBPM/sx6sbh1rdiy2SwGCWmWBwq+f5gyq9rR52fIEbMpN3I3OzTO/q5tVM51zZPx A+PVbp9fByV+vLkoGXpN9/fPiK//hTSyL4Zx7rjgcEhqjxJLcUaioRZzUXEiAF0OyixTAwAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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(-) 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; }