Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp1701075pxb; Thu, 16 Sep 2021 13:21:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzH+EP04WfetYCVuRZw2xZz0hhnUpaY7bFJkSYgPQtybucVerF/RT94mVz6BWLFfiT+Nfna X-Received: by 2002:a17:906:7802:: with SMTP id u2mr8279300ejm.325.1631823684619; Thu, 16 Sep 2021 13:21:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631823684; cv=none; d=google.com; s=arc-20160816; b=qUruynkz5IJR1uDcD7NmqgLR7DJhEbOvg6yNIRrAMqFYMpohpBgYyTE5lGJWnUg/d6 ySvvDtTjKE6pLyvx8tzYNKWR2Vg2kvfYiWhCWRuleRakicSTYzUKMVeLInLdHLgppKhB hSfpPU56HJ6/cWE+iKLcPRlMGb9irG8n2jYSZEft4OHxyGnBHCIfGzTfmVk22aZXjMII kD6gi7A1jeQcJ3s3cgZZnTQfVCmtojUF2A8/FjsowXHX7OW1rsPzl2Fj5gL8HmB7Q2mL tagHCa9HeTbAt0oZ9eDIpBY5Q8Runo34MdOsYuyTYtCX/7mrs8AU9MwkgQ8mluJKSONr VfCA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=AKIZx/OZNxoDf9uUYSQsj/NRz6HoLjDXTQ7idsPylNY=; b=0sFYxGSIdGzsUuPYnG4IRHqlbTbtyl0ksjjWujjMFIEryvw1Enn3HL8e5y9fSsX/lN /j9Fh4+qrtkmYsfM1ngwap1WGJGek73qW2IStPrgu3ko/de/TU0soMnf82MI9iQ61nHa DxUbcl/2UKQTDLjN8X3UiPvjrnvKUGmtyQ/uPAEUU8TOmDulrWRFFSMKqw0AJJ8awpO8 o25rFvUtqXlfid1/VXxH0aRyNxLevK9hYBVBpCOt41xrORZdxJpjb3YpOd4g12afNbtD NnzXeNNmUV62pojFQ7s+t/Q9GzjbdNkfDYkEMPwGveiAX9D2jAxs3D8qT0iWDgUgzl3n z9dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Cru8LJFJ; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v6si4299134ejh.227.2021.09.16.13.21.00; Thu, 16 Sep 2021 13:21:24 -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=@linuxfoundation.org header.s=korg header.b=Cru8LJFJ; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241279AbhIPQYx (ORCPT + 99 others); Thu, 16 Sep 2021 12:24:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:54626 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241109AbhIPQPL (ORCPT ); Thu, 16 Sep 2021 12:15:11 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9F81F6126A; Thu, 16 Sep 2021 16:11:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631808667; bh=vJf/hOLRbSjBB5md0JjqiGgNpfTuhUqJ4jPhXj65f/0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Cru8LJFJp2d1VOImVsjzKh7iDC9KW3wohDdeqsvDtI41qmPVRoCL/d8Wevoq2XARq S0vB2uTVRCw3niR9eFiufSJZVvnVF6iRDjFXdvmS96UmAa9qkPHZl+YX+BDH3SOC60 edNS0Ipsc+s6KWtfkNRsPcjVWhjIB4ublni5H04A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Yang Yingliang , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.10 145/306] media: atomisp: pci: fix error return code in atomisp_pci_probe() Date: Thu, 16 Sep 2021 17:58:10 +0200 Message-Id: <20210916155758.991743851@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916155753.903069397@linuxfoundation.org> References: <20210916155753.903069397@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yang Yingliang [ Upstream commit d14e272958bdfdc40dcafb827d24ba6fdafa9d52 ] If init_atomisp_wdts() fails, atomisp_pci_probe() need return error code. Link: https://lore.kernel.org/linux-media/20210617072329.1233662-1-yangyingliang@huawei.com Reported-by: Hulk Robot Signed-off-by: Yang Yingliang Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c index 02f774ed80c8..fa1bd99cd6f1 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c +++ b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c @@ -1763,7 +1763,8 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i if (err < 0) goto register_entities_fail; /* init atomisp wdts */ - if (init_atomisp_wdts(isp) != 0) + err = init_atomisp_wdts(isp); + if (err != 0) goto wdt_work_queue_fail; /* save the iunit context only once after all the values are init'ed. */ -- 2.30.2