Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp4345887pxb; Mon, 27 Sep 2021 15:07:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZnWldytG7zKarDssGKLyj460X+KA5aDAfiaP+MbJSmB/0imKx5fe6EU78z8TLH/KvvVV6 X-Received: by 2002:a50:dac3:: with SMTP id s3mr3140372edj.322.1632780464516; Mon, 27 Sep 2021 15:07:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632780464; cv=none; d=google.com; s=arc-20160816; b=NASOFvhe59uneBFMgwB+04KQ9PGEcjoAV2IsGiRrte6+YnLPNI+/rsxaKPOahYQmZ4 VkO09NyXaLuvJ/vDbHdyS7y4pxvVoIXfzJb/1xc2+M310aLb3KboVa3uFYxTlqsXQzIv dfx32L0MMEsEAqhXXb/Hx9YpMzZzJOzFdBTp7tZcaEjuQSbh1Su3/zBJUIm9I7Iqbvub 8LWrYqR8pwkNzBQZXzSUH7r2s2Mm7eVEoY2nTZJ+ajPE8SvAGgbLgwwGEqskkn5c8IcU ToPOYZeguTfJQlBrslc6a4V2dYNK9zNvZFZw46LMlemxgPltVPZcPJO+F8M+1uZZwXvM wfEQ== 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=YC09ub7H5zBS0+xaUnAKeTnZGFxVdKsA0MqfDrrsdEA=; b=BCPeOUG+5mHbDpCw8OYulVgX/DjgAeLGFwsbqo2DBV/XRPLDTqNAsCov81l4PTd7Fo 67rUu+3y17FOKwS7JSXy6eD1UWhFq0jz6HtrQYZvP7pl0LK2d3byj98s0BIiqpwxJfrW Tww8DveM63wCJiliw9br6duKJ8PP15y2HUbRNCj/xMQ++Xd4uKjl8hJ36oEQFixs6ItP qCfXT6+9ImkdeU8NW93ZNgP8j699Xv8SpteEssEyNga1VQ6EEJbll54LxaTkMFMPZHRu upyK8xzHAFU2cGyBVSOgdi30yAvtIR+osP/Wnu7AGyV5B3awWFpktl9uh0oBqbDaPyhW 3MlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b="qXe/9q0V"; 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 e21si1690286ejd.167.2021.09.27.15.07.20; Mon, 27 Sep 2021 15:07:44 -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="qXe/9q0V"; 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 S238268AbhI0WHT (ORCPT + 99 others); Mon, 27 Sep 2021 18:07:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238261AbhI0WGf (ORCPT ); Mon, 27 Sep 2021 18:06:35 -0400 Received: from bombadil.infradead.org (unknown [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 42C1AC051746; Mon, 27 Sep 2021 15:03:05 -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=YC09ub7H5zBS0+xaUnAKeTnZGFxVdKsA0MqfDrrsdEA=; b=qXe/9q0VrWzJQ6L2paDwqwlDOz 9ymCO7BTLZOnONaIF04YusbGQgSi/HTXHc7CH4L8jQB9OCifwbM/e8/udMQB714Tt2PKNfgc1JxGv nNhmK4Jy1UGl7LOty8p0f126dlU8JOi70lbitnNl7os7wvm2gVE7+FY6PBSph0ZzWp+3hgDALhS5v dRr4ALq5v9A+dsNmHau7/VVWd1NgAmi7OyP0fJMvHeYqcrwnXycfo8WyCshLUgZ09TON4YfPAaH2c +u5HforcmGk1TYHOcC5dEi3oEeGwOMt5VXIe/WiJ+NoX6wzLJom9jjrw9gGganY31wRN4n4Wo8zv+ CxGWakbg==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1mUyiF-004VI9-IG; Mon, 27 Sep 2021 22:03:03 +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 05/14] floppy: add error handling support for add_disk() Date: Mon, 27 Sep 2021 15:02:53 -0700 Message-Id: <20210927220302.1073499-6-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/floppy.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 3592a6277d0b..0434f28742e7 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -4696,8 +4696,10 @@ static int __init do_floppy_init(void) registered[drive] = true; - device_add_disk(&floppy_device[drive].dev, disks[drive][0], - NULL); + err = device_add_disk(&floppy_device[drive].dev, + disks[drive][0], NULL); + if (err) + goto out_remove_drives; } return 0; -- 2.30.2