Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp250608ybi; Wed, 29 May 2019 20:39:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqy/GtgTHAUqDjsFQT1kecGMBbYJZgpTy6IiRzDmqaHwshRY30tjFFhL65+8h7Osy+avmrX9 X-Received: by 2002:a63:1a5e:: with SMTP id a30mr1661756pgm.433.1559187561147; Wed, 29 May 2019 20:39:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559187561; cv=none; d=google.com; s=arc-20160816; b=NXcAcU3St779svvcAQJTt12gBTJwvG97cg3RykeL+8usdScJ44bD6WbtISrX2ZNo7i YR3RANz/RSFabSEPjwxm3gaKeqLEit2V2eAJDshG6/TK2dXc2THpLOtr0WucW1LQpssD BvHYUDGd3tpW+F0SWaR0FW4oerjKsNV6CIJ03Siywpw3EnjxKPNG3m0Ny6eYdxF6/9FP E7T7VewafsnpqQ5nP3XeQuPyPqFJX2nZtT8qYN67KzFECbDyWliZU3knu422p5MptN2f 5BESb9ohGZMTZxj6iJGJoy0QfytZBjCiZOTDuZ9ADeQpfEBtCNKJ1wEpDsfNfPrD34sZ I3QA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=bEtgb8S/fohr18IdJOlrI9wJSDZTrro/xe9tMwXngZw=; b=gcL+xXKfLEkkfJA7/x94htQcFnBvy7BFlgt+nxxOCTzxKCGIg6XYWzPep6htINXvhx p2utDnksUKq8X0HupGrtcLBlZrRspGyky8s29tnd7MNowSJGGd4UUP4K8daIkpcTH+EG FsSHDaZ4qd36Oh1gm02EkVrFPaDz8auG8ZdFAtHaZ4FxIphnDi97u81PBEPp5o4kN3Kw oAH0azQljVEzJ6AluSe907vxaXHrT4MCpAthI62V9/Wkq5m17UNU7tlYor2k4rsJ5hCC gFx+4PfkYx9IWRhZP1NkIyvT3CsM/bo0WSF0C4McZ4TsMpHbGmMwteiChPDevkyBWkWa jcBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=mPe56LSy; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n12si1873472plp.114.2019.05.29.20.39.04; Wed, 29 May 2019 20:39:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=mPe56LSy; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387424AbfE3DYm (ORCPT + 99 others); Wed, 29 May 2019 23:24:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:50346 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731477AbfE3DSP (ORCPT ); Wed, 29 May 2019 23:18:15 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D9D3A24787; Thu, 30 May 2019 03:18:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186295; bh=sQSWaWrbGBLv9muTNQfRr4rpK+DViyENGQjtd2P1mug=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mPe56LSycxW0OLd9mzZdJMv6W6mIti3kGuBRxcHguuvtEavL4eDm2JzePoAVW+t6r hVHJB7HFnEVA+BPmQDuDH+SqJnimDpOj5jC7C/Q+5jTy+FOn8QnnfQFOcSHATWNHFO KTndNIg+KBGVovyHeX9HBOe5tE24QJcCxY+HgOto= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kangjie Lu , Avri Altman , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 4.19 255/276] scsi: ufs: fix a missing check of devm_reset_control_get Date: Wed, 29 May 2019 20:06:53 -0700 Message-Id: <20190530030541.099437140@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030523.133519668@linuxfoundation.org> References: <20190530030523.133519668@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 63a06181d7ce169d09843645c50fea1901bc9f0a ] devm_reset_control_get could fail, so the fix checks its return value and passes the error code upstream in case it fails. Signed-off-by: Kangjie Lu Acked-by: Avri Altman Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/ufs/ufs-hisi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/scsi/ufs/ufs-hisi.c b/drivers/scsi/ufs/ufs-hisi.c index 452e19f8fb470..c2cee73a8560d 100644 --- a/drivers/scsi/ufs/ufs-hisi.c +++ b/drivers/scsi/ufs/ufs-hisi.c @@ -544,6 +544,10 @@ static int ufs_hisi_init_common(struct ufs_hba *hba) ufshcd_set_variant(hba, host); host->rst = devm_reset_control_get(dev, "rst"); + if (IS_ERR(host->rst)) { + dev_err(dev, "%s: failed to get reset control\n", __func__); + return PTR_ERR(host->rst); + } ufs_hisi_set_pm_lvl(hba); -- 2.20.1