Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp715656pxv; Thu, 15 Jul 2021 14:16:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw4YKBrTbhDNe7JMm559M1C5OwN6TaeNq3hTsjngVJ1SfdXlwAj0bHm5J+J9aLHQ2g5wsCu X-Received: by 2002:aa7:c412:: with SMTP id j18mr9492143edq.119.1626383770397; Thu, 15 Jul 2021 14:16:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626383770; cv=none; d=google.com; s=arc-20160816; b=OJqopjmd+L6t6qcwvqkllQ06+3tVeSgb2xKSxhBFUoMv++6MnvSGxmVcxpMtF3uEFC wXxLBQt32rW2sxPMcY+QyTraEBCXp49oaTxlyaUT8THAFaUPtbAguW5I/0j7IK/mt4qe J37886c54i2esBPyBvApSEJbh43VomodmD1yBhdByXeJKsUqFQSb6haLlkQ7POLTLX84 E15dmYxkudus9C3I59iYqASxtU/gC/mujfc1JqE5d0MQfEl6aNkxbYFS1iHNbEXvPHfz 68MdwPF0OdE5Lh0W0lUyNLDlV5wxC0IhSRMBz8rHapXObq3TXTiLSkdj/RieXwlXSVcT 8J+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=1e/4AsgG4GwfF1IctxosNcfjCE1cPWukX3Y+DFA9aXg=; b=LhNS9LHNhck+tZUMnxCXHl36U7AWN2xJwA6Nbgry0d8m31QtdKbArknrSI9QipRfji okt9Ylg7Z4TLAjELs+vEB2Fz7mcMIm6fXVpEi1/RTncEQ7kQnRjurR3/CpKa3f/9xJNO TRo0iyYNn0Y27ZlWGsORYz3Eru1agd1tKi0Xf1NknU3iKZd7HS00kE9Rr8/Klz0o3PZj 38LOjqJjBiEh2s4q0UxOTUUYTOfDzv56nP88eGoFYI/6SJab41QnT80FuDgPdp9TLgi1 uVsIzPKDr+JFOB1J8qB47P+UEdYqfg81E4FD3rUpOl3hRpNa0XFZycJA97Qc+BwVJj6c qjuQ== ARC-Authentication-Results: i=1; mx.google.com; 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 x24si8869699ejv.514.2021.07.15.14.15.47; Thu, 15 Jul 2021 14:16:10 -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; 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 S231547AbhGOVCv (ORCPT + 99 others); Thu, 15 Jul 2021 17:02:51 -0400 Received: from mail-pl1-f179.google.com ([209.85.214.179]:45951 "EHLO mail-pl1-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231153AbhGOVCf (ORCPT ); Thu, 15 Jul 2021 17:02:35 -0400 Received: by mail-pl1-f179.google.com with SMTP id p17so4062368plf.12; Thu, 15 Jul 2021 13:59:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1e/4AsgG4GwfF1IctxosNcfjCE1cPWukX3Y+DFA9aXg=; b=TXDR7KN89jVE0JngLi1ZTf2SL70P8Y2QYd38VXOXs/eePYfvAjndgS63Ubv/EjAxZC 7+8eLr8AfoM2VgP/uW/w3qJVsdjXa/8LX20dyeqUsoNMao7MvYsZ6ZePz6GXEjBhYwjz 3GIJNSNn86rsPFgIAMqslrbpdpwxfR9rwp1mQYetZOtz/11Elu2z12lUlmexJ7cvrTtL QvLdk4/+nyKxh5bcuqq8n3+ZDBSeh1+SMc0+fePsYBh79SivT9h/KpSBvEXN7fw3MLHj lzwKMVlszV7SzxI0dY2+cMmy5kZD6iok68j4RAO04B88LyWXTwxn2hZDQ0mKKnW0YRpl /nJQ== X-Gm-Message-State: AOAM531nYzlYMZvNVz+VjzO2VxXfDH0ED1myY0djVwDP6QIULPFbBDBZ 95b2tg346u53WcZZdlC0w6w= X-Received: by 2002:a17:902:9685:b029:ef:70fd:a5a2 with SMTP id n5-20020a1709029685b02900ef70fda5a2mr5001363plp.20.1626382780110; Thu, 15 Jul 2021 13:59:40 -0700 (PDT) Received: from localhost ([191.96.120.37]) by smtp.gmail.com with ESMTPSA id b7sm7416455pfl.195.2021.07.15.13.59.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 15 Jul 2021 13:59:39 -0700 (PDT) From: Luis Chamberlain To: axboe@kernel.dk Cc: hare@suse.de, bvanassche@acm.org, ming.lei@redhat.com, hch@infradead.org, jack@suse.cz, osandov@fb.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Luis Chamberlain Subject: [RFC 05/12] scsi/sd: add error handling support for add_disk() Date: Thu, 15 Jul 2021 13:59:13 -0700 Message-Id: <20210715205920.2023980-6-mcgrof@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210715205920.2023980-1-mcgrof@kernel.org> References: <20210715205920.2023980-1-mcgrof@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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/scsi/sd.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 6d0a82da7131..01af61a38e4e 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -3489,7 +3489,11 @@ static int sd_probe(struct device *dev) pm_runtime_set_autosuspend_delay(dev, sdp->host->hostt->rpm_autosuspend_delay); } - device_add_disk(dev, gd, NULL); + + error = device_add_disk(dev, gd, NULL); + if (error) + goto out_free_index; + if (sdkp->capacity) sd_dif_config_host(sdkp); -- 2.27.0