From patchwork Tue Jun 28 13:42:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 9203265 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D988C6075F for ; Tue, 28 Jun 2016 13:43:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CACE8285E7 for ; Tue, 28 Jun 2016 13:43:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BF23B28602; Tue, 28 Jun 2016 13:43:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A28F0285E7 for ; Tue, 28 Jun 2016 13:43:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752018AbcF1Nnc (ORCPT ); Tue, 28 Jun 2016 09:43:32 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:45439 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751864AbcF1Nnc (ORCPT ); Tue, 28 Jun 2016 09:43:32 -0400 Received: from epcpsbgm2new.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0O9H02TL8I4DUUA0@mailout2.samsung.com>; Tue, 28 Jun 2016 22:43:29 +0900 (KST) X-AuditID: cbfee61b-f798b6d00000114d-98-57727f01a6d4 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2new.samsung.com (EPCPMTA) with SMTP id 07.41.04429.10F72775; Tue, 28 Jun 2016 06:43:29 -0700 (MST) Received: from AMDC1976.DIGITAL.local ([106.120.53.102]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0O9H00JY3I3X9I00@mmp2.samsung.com>; Tue, 28 Jun 2016 22:43:29 +0900 (KST) From: Bartlomiej Zolnierkiewicz To: Jens Axboe Cc: unsik Kim , linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, b.zolnierkie@samsung.com Subject: [PATCH] mg_disk: fix error path in mg_probe() Date: Tue, 28 Jun 2016 15:42:41 +0200 Message-id: <1467121361-21632-1-git-send-email-b.zolnierkie@samsung.com> X-Mailer: git-send-email 1.9.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHJMWRmVeSWpSXmKPExsVy+t9jQV3G+qJwg613BC1W3+1ns9g4Yz2r xdpvO9gt9t7Stri8aw6bA6vHzll32T0uny316NuyitHj8ya5AJYoLpuU1JzMstQifbsEroyO gx+YC76xVXx8foe1gfEdaxcjJ4eEgInEjqX32CFsMYkL99azdTFycQgJzGKUOH17EpTzi1Hi 6v65TCBVbAJWEhPbVzGC2CICChI9v1eygdjMApUSH5YdBZsqLGAmsWZxPwuIzSKgKjFn9Tqw Xl4BD4mX3/ugtslJnDw2mXUCI/cCRoZVjBKpBckFxUnpuUZ5qeV6xYm5xaV56XrJ+bmbGMGh 8Ex6B+PhXe6HGAU4GJV4eC9MLgwXYk0sK67MPcQowcGsJMIrVVUULsSbklhZlVqUH19UmpNa fIhRmoNFSZz38f91YUIC6YklqdmpqQWpRTBZJg5OqQZGmcURWZcdlobof2LfNlUn7A67saW2 mDzLi4pU4SLdRJXXb76I8x61/B3K+CVIbh6rXPG9+8ynnpmtkGRKa7ykw3XH88ftlr9udyYy xhonR3703L/2y0HTw/bi4uFGM0vcj8/T511RNeN/wj825YScl37W2kXPTPva3/zdaLi8balh rNHerHNKLMUZiYZazEXFiQBoBmLgAQIAAA== Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP MG_DISK_MAJ is defined as 0 so dynamic block major number allocation is used by the driver and the assigned major number is stored in host->major. This patch fixes error path in mg_probe() to use host->major instead of using MG_DISK_MAJ. Cc: unsik Kim Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/block/mg_disk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/mg_disk.c b/drivers/block/mg_disk.c index 1ee3918..e937fcf7 100644 --- a/drivers/block/mg_disk.c +++ b/drivers/block/mg_disk.c @@ -1015,7 +1015,7 @@ probe_err_7: probe_err_6: blk_cleanup_queue(host->breq); probe_err_5: - unregister_blkdev(MG_DISK_MAJ, MG_DISK_NAME); + unregister_blkdev(host->major, MG_DISK_NAME); probe_err_4: if (!prv_data->use_polling) free_irq(host->irq, host);