Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp4345528pxb; Mon, 27 Sep 2021 15:07:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyAbdNnBq5Um1Sajes38n6aBwnqicOeUn+STAYRA3cf53U5bvAjIKiZbzbq/yuDMLKfoz3t X-Received: by 2002:a17:90a:6605:: with SMTP id l5mr482473pjj.174.1632780434172; Mon, 27 Sep 2021 15:07:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632780434; cv=none; d=google.com; s=arc-20160816; b=qe7JPNjCW9+6qr7B2I2DroWmUSmpRd5Byn9HGv+bCiqEZyIeXF0Dt9vRjUd+pUJvAA sqtOUFk50NNKdN0Heq2uOXQ/iG3uYwYlbtkBd3Nf7fLRrz7yjGuZOOHpgWudy9jZuoKW TGMOvyCV0B/wTx+64JirigxIljfrJv8UmatDcewpWiTrpEzUpZa0pj8RJkmz7VYa42yO ZzTsx6LabVE3B0bMXSN6aGPOJ9BIoZc1ppUvuTFg19f4eaxMFYgt9kV0WD3gjbyAeUmk 24ZJHq/AgEZKX/QG8g/7kTmXagXebpwlEf67LHM59jjyoBR7WcO+u5pW3D9QCUzCjCwS CZ0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=4imHp2CJ0meb7xhuvqWowaDJhq/kim8sGOgKxWzbOuY=; b=pGv6vnXF6YYwj3of8wwoFBjsD/c6xOri8BcTaGvjXwyH50bRl/tf+yO05KEs9tlRgM Ub4x52WIjKXuij/ejawrvaF/Gc32HmpGiJ1/CzHoP0adp1g8eAd5fkZVwR+M19VUV6Nd RXF+MsMaT8wjILOK1F0/ScYvAcH/mJPWq8oEi1I9sB4F5wkiQfaQ3QJa3acy7bzetxyn qQ5UCuKXGVqRuxSXYqRhQSj+zOzcRG7/K5vtfDZKmKHyfvrED8tI6dL5xqWpaSH6lrQh GyDpRdAMHC5gY8gVJ/ML17U18a6Z7dy3/SC+C+Jpcw+V4sYgUejosKC8IvWy9TliPcIC Ncng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=EuObWckM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t20si23492961pgv.302.2021.09.27.15.07.01; Mon, 27 Sep 2021 15:07:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=EuObWckM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237824AbhI0WHc (ORCPT + 99 others); Mon, 27 Sep 2021 18:07:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237865AbhI0WGl (ORCPT ); Mon, 27 Sep 2021 18:06:41 -0400 Received: from bombadil.infradead.org (unknown [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23639C05174E; Mon, 27 Sep 2021 15:03:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=4imHp2CJ0meb7xhuvqWowaDJhq/kim8sGOgKxWzbOuY=; b=EuObWckMW3VBDLT2U6RXx8Gk8w DR0wABVa6MZv1QO6A3oasrM7ajQiMtGDJRFqDgs0PE+Or8nsKHrEHN731dApGgYJuowWvbTs7XIbQ TZUYlBv8AWzoidOOPSniYllbtPFF9TzncOW8vFC/4m9fzoQz7h2BQsLZigclq63MWwe24muyjzCUA R5m473v8VvCgkUT+gyob0kASVEQugCKnE4l2C2o/+lvbuI5XHov6FdnrgY3eas5IE5jbNYWodbLcZ XwbUkzYfIArl2E+OZTvNDvmbJX12cZI1aOUOcTu2/FfeVBa8BzfIYtH+IhxnQbktXw4uBR3krq52v SyCX1qfQ==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1mUyiG-004VJ3-91; Mon, 27 Sep 2021 22:03:04 +0000 From: Luis Chamberlain To: axboe@kernel.dk, efremov@linux.com, hch@lst.de Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Luis Chamberlain Subject: [PATCH v2 14/14] block/ataflop: add error handling support for add_disk() Date: Mon, 27 Sep 2021 15:03:02 -0700 Message-Id: <20210927220302.1073499-15-mcgrof@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210927220302.1073499-1-mcgrof@kernel.org> References: <20210927220302.1073499-1-mcgrof@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Luis Chamberlain Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We never checked for errors on add_disk() as this function returned void. Now that this is fixed, use the shiny new error handling. Signed-off-by: Luis Chamberlain --- drivers/block/ataflop.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c index e9d874f51597..5dc9b3d32415 100644 --- a/drivers/block/ataflop.c +++ b/drivers/block/ataflop.c @@ -2081,7 +2081,9 @@ static int __init atari_floppy_init (void) for (i = 0; i < FD_MAX_UNITS; i++) { unit[i].track = -1; unit[i].flags = 0; - add_disk(unit[i].disk[0]); + ret = add_disk(unit[i].disk[0]); + if (ret) + goto err_out_dma; unit[i].registered[0] = true; } @@ -2092,6 +2094,8 @@ static int __init atari_floppy_init (void) return 0; +err_out_dma: + atari_stram_free(DMABuffer); err: while (--i >= 0) atari_cleanup_floppy_disk(&unit[i]); -- 2.30.2