Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp1932415pxb; Thu, 16 Sep 2021 20:44:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxqH+DwqWMbKOJpjKFNM0VK3ABsM2VRvqa59rWlOCZ/sJs28QOVSGftGnhJH5I8SUI9wEXn X-Received: by 2002:a05:6e02:ea2:: with SMTP id u2mr6498043ilj.133.1631850283798; Thu, 16 Sep 2021 20:44:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631850283; cv=none; d=google.com; s=arc-20160816; b=lRK+V4sa7GDiXTcCeN4AEcczzIjySq2IWmDxRUwXLowazQgWCmfGPucJSNMCd+CsGw e3Du3aLth1z+/esV11MZ0UwO087taCzjERbPH9z3rBVp+/wTfJfv8Wae39xV6PGG/BpO emv8qwAuqJBQMuK+EkyKn9f20UWc5KprV4KzWZWydateRgfdSIE6iW1+R6O3Hu1k8neu lnzSKTm7B23pIIa9NOdpM0kHPrLHgPUXmsjTkOK50YWTBVEnSu70ctwG1RafrnoU8dre sJM1a9E3LrIyk1CKQ6TXu6Pb09BdKu4DAg3+1njtStMWKit5O0h5j6Xw1t8KdiAHpVQj GTPg== 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=/VsF3rZ+pmr9OPh3D13qYFXE5j5imYJiStfEIV+0cS0=; b=v89e0eIfSAEufqNwgTJJmGEsNMWhxAtuu3DAxPHDmhB+SUgv1tweHtY2t4gL/cTFVw 0iQLYKh5Uj4qin/8eu/sxYWx4w0DnAv7YZ7vODBUBQtvY3fanW++G27oNWyB1MzGgco3 WJjbEbWn1EtgZ0VEcdwGIuwqeupBu3cu7/LDnbHplOKS2u6feEG035hWWkJF9oTfG8b6 7Lz7K4D/ddVtueYe+tKgdQ42wH2cIgaQf2qbFxyKOyCAauCOHM7XiQK6IJnIBfvSfdXI oRUN0Q4tKS9UxXiNpi7tpNWZJ/G+QHV7icdLRaomQiC/dR33qiclwklM8M/BFXvcExQY ZPIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=dJzXnLrb; 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 d11si4130385jaf.24.2021.09.16.20.44.32; Thu, 16 Sep 2021 20:44:43 -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=dJzXnLrb; 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 S1349060AbhIPRc7 (ORCPT + 99 others); Thu, 16 Sep 2021 13:32:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:46958 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348159AbhIPRYF (ORCPT ); Thu, 16 Sep 2021 13:24:05 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7138761BD0; Thu, 16 Sep 2021 16:43:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631810625; bh=gt5BgoMf7PUKbuUKs8Clt7Gaku57zTSihOUxXKz1r40=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dJzXnLrbMXTpgadgefIcBkxsIEff0YLEbe0lEC4RoLLBGLhUzVEIBZnZCdX8FZcBw cPnxGnKl1YbD1nSTsjShytl8Wk5agOIgU/B1wSqDm9emEzxItdJ+5ZjPQYcENonGxn 8q0nWD4Qx3jBOOTWK99b915rSSrn8bpclQktefYg= 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.14 210/432] media: atomisp: pci: fix error return code in atomisp_pci_probe() Date: Thu, 16 Sep 2021 17:59:19 +0200 Message-Id: <20210916155817.951214524@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916155810.813340753@linuxfoundation.org> References: <20210916155810.813340753@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 af0d83eaa68c..1e324f1f656e 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