Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp444995pxb; Thu, 9 Sep 2021 04:45:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxWgyvXqQ+vYNFyny/UReFwFJmHwn1ABc72spA+5D0kQ9xF/jltWatt3c0AmpYTj1Q08Oa1 X-Received: by 2002:a02:cf06:: with SMTP id q6mr2388953jar.89.1631187946876; Thu, 09 Sep 2021 04:45:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631187946; cv=none; d=google.com; s=arc-20160816; b=x9EZBvyOdRH2H357nJ8qzD5zTGcXmlL+w+3k8On83pmUnp9JLOlgYCGypbYCBmEL0t 6MZXcaNMyxNlt5PGMUfk43gyAvjhvArZyXL8fB+MbRgi3G+mmLVU+ZwnKBnt/uhVQ4oF EIncZnoKwOtswyNPqKREcPxni4wjYuCubp1S4cW3GWde/0EDdGg2V+SPgfTWJp+537AL 5NdfRfGwlJxi8Cwt+ftMfJ7gmy1JEILKVP57ABeJH2/CeJPm9Bl4m0uxr4BuoxWW4Cvl FKy/nepwuZ7MwRLJNLyz4vnfTAjve9+rO9nH4xF8WCG1TIzVqpyubL8XQDpTfkYPTYds xLyg== 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 :dkim-signature; bh=/VsF3rZ+pmr9OPh3D13qYFXE5j5imYJiStfEIV+0cS0=; b=a8dzofJ2Y+U+3cbBoVvBKhmVbzymJ3W2StYQVyYMMcLuOt7DB80a6p+ewS3O54nLPF Owb4FEV+qcYB43FggGwYqdxWl1hnZ9FeoSKfNwRe/9nXwG9gcYBh7/DDRGipVSHDibT2 XfzlhknK2aIrfmvqNpJXCtLia+7fdJNuVSj/Es/pqsQrNKJ0RSiiEy3TTejnCDgTrn0Q tKGBZKbJw2HCz31LSiU9zaTDaSdPRV5vcxLmjNx35Opa2eXw4eQGIphqOVtMJuBTYweQ KLN7VUw7ycWFwxM7NH+EOebyBpjsLGXnHPR41TJwLgSuRUC2svxOSBDglvGJ5EPqTpRS LYug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=dke46iL8; 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 m82si1290136ioa.74.2021.09.09.04.45.35; Thu, 09 Sep 2021 04:45:46 -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=@kernel.org header.s=k20201202 header.b=dke46iL8; 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 S240607AbhIILqD (ORCPT + 99 others); Thu, 9 Sep 2021 07:46:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:46218 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238936AbhIILnv (ORCPT ); Thu, 9 Sep 2021 07:43:51 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6E65C61211; Thu, 9 Sep 2021 11:42:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631187738; bh=gt5BgoMf7PUKbuUKs8Clt7Gaku57zTSihOUxXKz1r40=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dke46iL8mQAobT72XVJCZOt6fGlOGrJ9YlUiE44xoI82wavDJbGcGsWfp+tJ8X28s x8mOLmDgFU822fn4YmGJK+xI7qQkV9aZ+/9YZUko/jS/0aJaWdbECPGOv5sSM/gP3J JGE/FS5m/1vSkduI0YejMWYuL1Kzk3k6lTcQl4JxN3Lpbhw79XtiQZQqoGWYrO4gxx l2t3tS2SeHxj/e6oTir8thv6OQXdlk9RZ/6tjqQLdZBGlIbQvptHwd1PIx/9QtLyJg +Z24rdl3ApAnRifOAm6JoeZiIgmjnCkEEttjyZKE8+KZAxdzc5JgAcND20kKfrI0T7 DiBpaEfKsSA6w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yang Yingliang , Hulk Robot , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org, linux-staging@lists.linux.dev Subject: [PATCH AUTOSEL 5.14 056/252] media: atomisp: pci: fix error return code in atomisp_pci_probe() Date: Thu, 9 Sep 2021 07:37:50 -0400 Message-Id: <20210909114106.141462-56-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210909114106.141462-1-sashal@kernel.org> References: <20210909114106.141462-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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