From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 86B8AC072B1 for ; Thu, 30 May 2019 04:00:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 56BB124F5B for ; Thu, 30 May 2019 04:00:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559188852; bh=sQSWaWrbGBLv9muTNQfRr4rpK+DViyENGQjtd2P1mug=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Le9efeb8VmWH0sMpFBtw9pU/D//YjjzRZZ9XROjdkISrhVf7X9jazY9y6d4AUAuJ5 4nVRjvAEKDR7kXUKF2GoZ2VnQnpaGGGTyshGbmY+ClTJgDOXWWaUs9rC9Udnzo623G W3wcWX8Ml+88SGSvpFygllIB5B4ABCJp8cO3iIOU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731484AbfE3DSP (ORCPT ); Wed, 29 May 2019 23:18:15 -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: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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