Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp2609504pxb; Sun, 17 Oct 2021 20:24:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz/sF5sDlCmFSWsI2WzYaauSL/LvDHd6Qd67yI6wL4lwwcoqNIW//NuBbhznTvTgyDQoo2i X-Received: by 2002:a17:902:e88a:b0:13e:ed55:296f with SMTP id w10-20020a170902e88a00b0013eed55296fmr24846504plg.11.1634527466928; Sun, 17 Oct 2021 20:24:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634527466; cv=none; d=google.com; s=arc-20160816; b=hn+0OI25eaip2br/O7DCL5rMojQ4jKHkMbwyKcvEqhv6lqKXi2kqytkZI4wEXwL9gY 76RXSDoDZmmYeIi3TpYBae1GF3chRxlD5c05WzYvEshNx8Sx5uCo+UYsqKFExgwdX/WQ PyTpr3QKqldarCPi5p0/dfgDv/ksg9IfIzG43mYeI64zx6F0dg822m2BzqqxVZoV7c+3 Z3vKiVjTv4K8lKFZoCZ14odjpIwbnBvLeqtbmc+M9LxauE9Vwnme9biSJnM8+VCJpkEn FOovr+nLxdLvPw7dfiQSxSTtnr6bPmBNQkk85Ug3W0Gww1dICoOU4cuuebzj7Vyx+Rrp tcxA== 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=IGHq/zn5r0bFrYNjymK6TXitnBNWw/sSmMius/3bC28=; b=bs957JdGvmOjLdDzMLYFBM/B3YbYmDfAU9Rif43hsXF68AdYWGNCbvEi3q7Kagnt/T dhu+CCt3pp+V2jx9pLTl2cNQWc3/EWHYCe2TN8AARWc0OAm6Ho9M8Twn+MIdW6Ovx6+M RdBkiLMu0pfCEejT+ToplZc2CUtS3lJnapf14MBtRfYESn9c8kKwCnl+1U+oy9dfHc2B 5V1l+T7sz54EXECLWW9FN77lJpmVzbGAcMESf48gl+Pwk7Acq2mVyNCMCGwFinsASkEi wep260pCGSnKXQRS7tMPAzfA96LB70n1VpiAzE0kngo+g+qCs5z0+HZN+/dVOvgVUAL2 jy4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=rbJob0wA; 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 q22si18374091pgv.490.2021.10.17.20.24.15; Sun, 17 Oct 2021 20:24:26 -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=rbJob0wA; 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 S239251AbhJOXzM (ORCPT + 98 others); Fri, 15 Oct 2021 19:55:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43754 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239080AbhJOXzG (ORCPT ); Fri, 15 Oct 2021 19:55:06 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 56B2DC061764; Fri, 15 Oct 2021 16:52:59 -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=IGHq/zn5r0bFrYNjymK6TXitnBNWw/sSmMius/3bC28=; b=rbJob0wAmG/PeQWeRRrtcYxYFJ YRzLLYnhKrbq9c5C3ei247lq9ND1TVEr+sI9h97FxuA1tDfOtKvVSODpgJJ/i5ca6MJz5xP4IMZD0 k8GLy6j5oqZLDBGq6gK+63F5oR4QWzhbpUf2yaRiQDDfd4AeZudkLHLPi6u++tOTgiZ1+ocHLyxwm NPrl9ADXuHopptXncDabSkoGhP5reCekk4mql+zkVM2KP3vBJufj+i8EcsZ3KxkVw2szdVftlSWsC 5jb2rMt8UQgpZTbkrS1+3YEmXkD2hhNaGQp9g1hn3QxwQHZoeI5/vA1VNosR6YWl+x1OyPfZeZ/mg VZqAqmPQ==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1mbWzt-009C3F-AU; Fri, 15 Oct 2021 23:52:21 +0000 From: Luis Chamberlain To: axboe@kernel.dk, geoff@infradead.org, mpe@ellerman.id.au, benh@kernel.crashing.org, paulus@samba.org, jim@jtan.com, minchan@kernel.org, ngupta@vflare.org, senozhatsky@chromium.org, richard@nod.at, miquel.raynal@bootlin.com, vigneshr@ti.com, dan.j.williams@intel.com, vishal.l.verma@intel.com, dave.jiang@intel.com, ira.weiny@intel.com, kbusch@kernel.org, hch@lst.de, sagi@grimberg.me Cc: linux-block@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-mtd@lists.infradead.org, nvdimm@lists.linux.dev, linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, Luis Chamberlain Subject: [PATCH 10/13] ps3disk: add error handling support for add_disk() Date: Fri, 15 Oct 2021 16:52:16 -0700 Message-Id: <20211015235219.2191207-11-mcgrof@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211015235219.2191207-1-mcgrof@kernel.org> References: <20211015235219.2191207-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/ps3disk.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/block/ps3disk.c b/drivers/block/ps3disk.c index 8d51efbe045d..3054adf77460 100644 --- a/drivers/block/ps3disk.c +++ b/drivers/block/ps3disk.c @@ -467,9 +467,13 @@ static int ps3disk_probe(struct ps3_system_bus_device *_dev) gendisk->disk_name, priv->model, priv->raw_capacity >> 11, get_capacity(gendisk) >> 11); - device_add_disk(&dev->sbd.core, gendisk, NULL); - return 0; + error = device_add_disk(&dev->sbd.core, gendisk, NULL); + if (error) + goto fail_cleanup_disk; + return 0; +fail_cleanup_disk: + blk_cleanup_disk(gendisk); fail_free_tag_set: blk_mq_free_tag_set(&priv->tag_set); fail_teardown: -- 2.30.2