From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752787AbbKIDRf (ORCPT ); Sun, 8 Nov 2015 22:17:35 -0500 Received: from mailout2.samsung.com ([203.254.224.25]:42756 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752425AbbKIDRd (ORCPT ); Sun, 8 Nov 2015 22:17:33 -0500 X-AuditID: cbfee691-f79d66d000001509-02-5640104aee33 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 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: Mon, 09 Nov 2015 08:46:26 +0530 Message-id: <1447038986-10922-1-git-send-email-vishnu.ps@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1446812535-10567-3-git-send-email-vishnu.ps@samsung.com> References: <1446812535-10567-3-git-send-email-vishnu.ps@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrBIsWRmVeSWpSXmKPExsWyRsSkVtdLwCHMYNkNfouTT9awWcxZDyRW 3+1ns3h5SNNizvkWFotXR34wWexZNInJYlrPJUaLs7+usli0zFrEYnFsxyMmi8u75rBZLPv6 nt1i18Pv7BafNsZabGiZxW7R9/0wu8Xz5lYWi0cTgFpfbn7DZPFr+VFGi+Nrwy3O/z3OajGl 7y6jxZYVD1kdJD1mNfSyecxuuMjisWXlTSaPnbPusnss3vOSyePy2VKPTas62TzuXNvD5nFi xm8Wj97md2we7/ddZfPo27KK0WP9lqssHptPV3vs/LSZ1ePzJrkAwSgum5TUnMyy1CJ9uwSu jGfHDjEXLOarWHbiH2sD423uLkZODgkBE4lFn1cxQdhiEhfurWfrYuTiEBJYwSix58YSJpii 7oafTBCJWYwSD84eYIdwmpgkvl2cB1bFJmAosWH2EbCEiMAhZompd74wgzjMAi2MElNPrwOq 4uAQFvCTWLPaFaSBRUBV4tXLThaQMK+Aq8Tsdj6IbXISJ49NZgWxOQXcJK63NYPZQkAlT27d BJsvIfCGQ2LVrjlMEHMEJL5NPgQ2R0JAVmLTAWaIOZISB1fcYJnAKLyAkWEVo2hqQXJBcVJ6 kalecWJucWleul5yfu4mRmACOP3v2cQdjPcPWB9iFOBgVOLhjZhpHybEmlhWXJl7iNEUaMNE ZinR5HxgmskriTc0NjOyMDUxNTYytzRTEufVkf4ZLCSQnliSmp2aWpBaFF9UmpNafIiRiYNT qoExUiRg0Y55F1k+8itnNi8R3FLIttnNa53NjmMvpe3LmR8xiTe8KvngObXp5yvd5UwPvh82 tCmYd6vjVLLzX9WM5/NmFtVfP7N5w+QH52T9o/8t68i0bebv6ufpY/DXbmd7++TZ7avT/E7P 0yzp7I42yF90U1J445VpkaJPz+5Ltub9f36KQswhJZbijERDLeai4kQAvDDcbvsCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrKKsWRmVeSWpSXmKPExsVy+t9jQV0vAYcwgzl/WC1OPlnDZjFnPZBY fbefzeLlIU2LOedbWCxeHfnBZLFn0SQmi2k9lxgtzv66ymLRMmsRi8WxHY+YLC7vmsNmsezr e3aLXQ+/s1t82hhrsaFlFrtF3/fD7BbPm1tZLB5NAGp9ufkNk8Wv5UcZLY6vDbc4//c4q8WU vruMFltWPGR1kPSY1dDL5jG74SKLx5aVN5k8ds66y+6xeM9LJo/LZ0s9Nq3qZPO4c20Pm8eJ Gb9ZPHqb37F5vN93lc2jb8sqRo/1W66yeGw+Xe2x89NmVo/Pm+QCBKMaGG0yUhNTUosUUvOS 81My89JtlbyD453jTc0MDHUNLS3MlRTyEnNTbZVcfAJ03TJzgGGipFCWmFMKFApILC5W0rfD NCE0xE3XAqYxQtc3JAiux8gADSSsYcx4duwQc8FivoplJ/6xNjDe5u5i5OSQEDCR6G74yQRh i0lcuLeerYuRi0NIYBajxIOzB9ghnCYmiW8X54FVsQkYSmyYfQQsISJwiFli6p0vzCAOs0AL o8TU0+uAqjg4hAX8JNasdgVpYBFQlXj1spMFJMwr4Coxu50PYpucxMljk1lBbE4BN4nrbc1g thBQyZNbN9knMPIuYGRYxSiRWpBcUJyUnmuUl1quV5yYW1yal66XnJ+7iRGcZJ5J72A8vMv9 EKMAB6MSDy/DdPswIdbEsuLK3EOMEhzMSiK8ZmwOYUK8KYmVValF+fFFpTmpxYcYTYHumsgs JZqcD0yAeSXxhsYm5qbGppYmFiZmlkrivPqeRmFCAumJJanZqakFqUUwfUwcnFINjFsuVJ1+ Hv7+bJ6GUcrq/ROft2d2vNd211RvX1CSsfCX6leOqev2HHEL9nsn92v6jaf8BbEuc5QPCqQ+ fHxwQjPXvdVLVMKW8trO8Cpfp2CT+LiyZ33N20Mi7z4b9HCf2tX9ca7Y/7DLGhcMhB4sm6N+ dXsZ87p//Sc/u09m2Jj0euls4yTVyXVKLMUZiYZazEXFiQDeziXiSAMAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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_err; } /* 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"); -- 1.9.1