From patchwork Fri Nov 6 12:22:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "vishnu.ps" X-Patchwork-Id: 7568951 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 39F68C05C6 for ; Fri, 6 Nov 2015 12:28:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2716D206DC for ; Fri, 6 Nov 2015 12:28:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3B0EE20657 for ; Fri, 6 Nov 2015 12:28:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1033214AbbKFM2r (ORCPT ); Fri, 6 Nov 2015 07:28:47 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:58876 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031995AbbKFM2p (ORCPT ); Fri, 6 Nov 2015 07:28:45 -0500 Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NXE0247I7ZV1350@mailout3.samsung.com>; Fri, 06 Nov 2015 21:28:43 +0900 (KST) Received: from epcpsbgm1new.samsung.com ( [172.20.52.125]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id 0A.E5.05272.BFC9C365; Fri, 6 Nov 2015 21:28:43 +0900 (KST) X-AuditID: cbfee68e-f791c6d000001498-3d-563c9cfb3b80 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1new.samsung.com (EPCPMTA) with SMTP id 41.2B.23663.AFC9C365; Fri, 6 Nov 2015 21:28:43 +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 <0NXE00BOR7P5LC40@mmp1.samsung.com>; Fri, 06 Nov 2015 21:28:42 +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 3/8] block/floppy.c: handle blk_register_region() return value Date: Fri, 06 Nov 2015 17:52:10 +0530 Message-id: <1446812535-10567-3-git-send-email-vishnu.ps@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1446812535-10567-1-git-send-email-vishnu.ps@samsung.com> References: <437969438-9181-1-git-send-email-vishnu.ps@samsung.com> <1446812535-10567-1-git-send-email-vishnu.ps@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrAIsWRmVeSWpSXmKPExsWyRsSkVvf3HJswg8YLYhYnn6xhs5izHkis vtvPZvHykKbFnPMtLBavjvxgstizaBKTxbSeS4wWZ39dZbFombWIxeLYjkdMFpd3zWGzOPK/ n9Giff4uRotlX9+zW+x6+J3d4tPGWIsNLbPYLfq+H2a3eN7cymLxaALQkJeb3zBZ/Fp+lNHi +Npwi/N/j7NaTOm7y2ixZcVDVgdpj1kNvWwesxsusnhsWXmTyWPnrLvsHov3vGTyuHy21GPT qk42jzvX9rB5nJjxm8Wjt/kdm8f7fVfZPPq2rGL0WL/lKovH5tPVHjs/bWb1+LxJLkAwissm JTUnsyy1SN8ugSvj2sPzbAXL+Co+LjjH3sB4j7uLkZNDQsBE4t+MKcwQtpjEhXvr2boYuTiE BFYwShyZdYypi5EDrGjzLKj4UkaJrQ/XM0I4TUwSH6ftZgXpZhMwlNgw+wg7SEJE4DezxIwF /WAOs0ALo8TU0+vARgkL+EmsWe0K0sAioCpx7tl1RpAwr4CrxM1JnBBXyEmcPDaZFSTMKeAm 8fAwE0hYSKBe4s+EHWATJQR+cEicO/yTGWKMgMS3yYdYIA6Vldh0AOoZSYmDK26wTGAUXsDI sIpRNLUguaA4Kb3ISK84Mbe4NC9dLzk/dxMjMCGc/vesbwfjzQPWhxgFOBiVeHhvLLEOE2JN LCuuzD3EaAq0YSKzlGhyPjDt5JXEGxqbGVmYmpgaG5lbmimJ8yZI/QwWEkhPLEnNTk0tSC2K LyrNSS0+xMjEwSnVwGjPXnWuQ27SnE7LW5/Uoho3Tfl1wT3yw+u4k+3ayVcMD7zfVdNweYN+ Uc+aL5uebC+c3vz9PzCipjXy5igITstmiVzql2bB4TsppGa/+5yvopdzbz00e5rMsv/i33ev ZSPnt3h/irlnbPZLtbM+4XLGhOLtb9gW/jJuZD9wtuD1d+4XPx/FGymxFGckGmoxFxUnAgA3 uw7XAwMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrLKsWRmVeSWpSXmKPExsVy+t9jAd3fc2zCDJ6t5bE4+WQNm8Wc9UBi 9d1+NouXhzQt5pxvYbF4deQHk8WeRZOYLKb1XGK0OPvrKotFy6xFLBbHdjxisri8aw6bxZH/ /YwW7fN3MVos+/qe3WLXw+/sFp82xlpsaJnFbtH3/TC7xfPmVhaLRxOAhrzc/IbJ4tfyo4wW x9eGW5z/e5zVYkrfXUaLLSsesjpIe8xq6GXzmN1wkcVjy8qbTB47Z91l91i85yWTx+WzpR6b VnWyedy5tofN48SM3ywevc3v2Dze77vK5tG3ZRWjx/otV1k8Np+u9tj5aTOrx+dNcgGCUQ2M NhmpiSmpRQqpecn5KZl56bZK3sHxzvGmZgaGuoaWFuZKCnmJuam2Si4+AbpumTnA0FFSKEvM KQUKBSQWFyvp22GaEBripmsB0xih6xsSBNdjZIAGEtYwZlx7eJ6tYBlfxccF59gbGO9xdzFy cEgImEhsnsXWxcgJZIpJXLi3Hsjm4hASWMoosfXhekYIp4lJ4uO03awgVWwChhIbZh9hB0mI CPxmlpixoB/MYRZoYZSYenodE8hYYQE/iTWrXUEaWARUJc49u84IEuYVcJW4OYkTYpucxMlj k1lBwpwCbhIPDzOBhIUE6iX+TNjBPoGRdwEjwypGidSC5ILipPRcw7zUcr3ixNzi0rx0veT8 3E2M4KTzTGoH48Fd7ocYBTgYlXh4DZZbhwmxJpYVV+YeYpTgYFYS4ZVjtgkT4k1JrKxKLcqP LyrNSS0+xGgKdNZEZinR5HxgQswriTc0NjE3NTa1NLEwMbNUEufV9zQKExJITyxJzU5NLUgt gulj4uCUamDs5fkv03/747EQzbI3kcHKKpN9Vf4cdsrNdgzOSos7F+pze3s3x72AHzuucx4y /dsRlOSYem9+Utz9jxaV8tJZZjrra55qHbFcxB3IcrY694r/vaX1PnZzTnne6zb84MA1+dPN uU1TEnsrJPSrfDKPZbrop9uGP957043p8elKUS4d8/1ut5VYijMSDbWYi4oTAa1euTlQAwAA 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=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 blk_register_region() return value. Earlier blk_register_region() 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 --- drivers/block/floppy.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 331363e..50802a6 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -4219,8 +4219,10 @@ static int __init do_floppy_init(void) if (err) goto out_unreg_blkdev; - blk_register_region(MKDEV(FLOPPY_MAJOR, 0), 256, THIS_MODULE, + err = blk_register_region(MKDEV(FLOPPY_MAJOR, 0), 256, THIS_MODULE, floppy_find, NULL, NULL); + if (err) + goto out_unreg_region; for (i = 0; i < 256; i++) if (ITYPE(i)) @@ -4250,7 +4252,7 @@ static int __init do_floppy_init(void) if (fdc_state[0].address == -1) { cancel_delayed_work(&fd_timeout); err = -ENODEV; - goto out_unreg_region; + goto out_fdc_err; } #if N_FDC > 1 fdc_state[1].address = FDC2; @@ -4261,7 +4263,7 @@ static int __init do_floppy_init(void) if (err) { cancel_delayed_work(&fd_timeout); err = -EBUSY; - goto out_unreg_region; + goto out_fdc_region; } /* initialise drive state */ @@ -4357,8 +4359,9 @@ out_remove_drives: out_release_dma: if (atomic_read(&usage_count)) floppy_release_irq_and_dma(); -out_unreg_region: +out_fdc_err: blk_unregister_region(MKDEV(FLOPPY_MAJOR, 0), 256); +out_unreg_region: platform_driver_unregister(&floppy_driver); out_unreg_blkdev: unregister_blkdev(FLOPPY_MAJOR, "fd");