From patchwork Sun Sep 17 13:47:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 141153 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp2174391vqi; Sun, 17 Sep 2023 08:05:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IETbuyDOV1wuBwTX1uiqdwO6xf2ZU5Kbsj/4MNWG+mwdEBXWIf0Y9MZ67NTsHvFYasuBYNG X-Received: by 2002:a05:6a00:84c:b0:686:24e1:d12e with SMTP id q12-20020a056a00084c00b0068624e1d12emr8753077pfk.30.1694963151948; Sun, 17 Sep 2023 08:05:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694963151; cv=none; d=google.com; s=arc-20160816; b=kwcWw1w6oPpFfIybJW2zEwMhyMusXJCXPBm99eS/17X9VX6f1TIyiSQksv7TbBw3Jr LHsfKaQL/0H9xN8rU7Jcsq+EsVonbU0SyLfHBMDs4QqKhhGP0XLsvPbjpztvyqRGmWrd DmajFv+UYXkG7LuIuwREDS1WMoPYj1E89Stt46zJMMyBSAFkPd+cbluJtBj7nwrFLpDk Sio1TmjpbeiaWLnM+vQ/tf3rHEMc9qBImK9KDoAz2a4vHKHKM1+/5rDWKu75qLZbIo9q VUgg79GpwtktG7cmCXtyppnSBV6I+UL1byINAIegJ/FXIkUtc1KGo5AYlI1VwJ+IVnS/ 6bYA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=hOGjJOJ5faGeiDJ8M4RMHf63I+hgy05f2bSDAh+zQrY=; fh=WPvz7JBVPJUvGJkjWf1NFcO4PXA7ex6S4+UZNBnsm3A=; b=MOu3QvfjGKglV6SaQp68lg0UNg9XDh9BUexQsyU70foPWXqzpODvBfWJenV15Hiigj Ryh/XXBaJr4WFNlHi5pB8O8GQZt19q4OyZlxfOZiTFlI8k1/yD+sMa1hUeWnWXgNCU0K VK7FpecFAE3PyJzBrSnI7FNgvZaWqej4WA6Jhf1j6TXruwuhIoDftYIDIZ+27lTKxYEL qmPXN4dXWu1zrkzyK+Z9EaiEHyQqd++P2xcqA+oOh5LIHmRrvuS/UGzOfIQQap1SA4Dr h3QwKZMM7lz+ChTJA29EEzU5CNZwWOmc2Guuo66J1Qv/oi1V2/c3RZuLMFDvhKYe5qhK cyJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b=SLmIQVLA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=wanadoo.fr Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id l64-20020a639143000000b005775c819f23si6576984pge.336.2023.09.17.08.05.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 08:05:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b=SLmIQVLA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=wanadoo.fr Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 2BD5681BAF3C; Sun, 17 Sep 2023 06:48:29 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234990AbjIQNri (ORCPT + 29 others); Sun, 17 Sep 2023 09:47:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36174 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236020AbjIQNr3 (ORCPT ); Sun, 17 Sep 2023 09:47:29 -0400 Received: from smtp.smtpout.orange.fr (smtp-30.smtpout.orange.fr [80.12.242.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E146C131 for ; Sun, 17 Sep 2023 06:47:23 -0700 (PDT) Received: from pop-os.home ([86.243.2.178]) by smtp.orange.fr with ESMTPA id hs7MqNnnjvRSUhs7MqLFyC; Sun, 17 Sep 2023 15:47:22 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wanadoo.fr; s=t20230301; t=1694958442; bh=hOGjJOJ5faGeiDJ8M4RMHf63I+hgy05f2bSDAh+zQrY=; h=From:To:Cc:Subject:Date; b=SLmIQVLAeIsjHjno63AidoYTz4Lvlg+QaN4WAqHJh8HRQ94RkPkTf35hFIdqpAMEw lceSC9tVm/O02R31TOE1iP70oU5WJc5GH+Y1F9Eczm2xkIVJReQcbTkEqa+yqzcpQf ju1UR2F1QeFroPHbe8WnhgOKd166Z4ipQ1Xyl1I+C/MfvjTiuVPgR65ZW651j3lm/t yGVn3aEWrShJ/eLk1OCamV9YWyj06g+XH2Xppqi+7srLVrMZUkTnP3X23Kj+Em2VFh L/6kCRqvKdVqRevvN57Fmp5j73n54PNFLlT4VEYk0ZZYLrrxAI6sZy1gXEh5GPKe3F IlRYxjziOeXvQ== X-ME-Helo: pop-os.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sun, 17 Sep 2023 15:47:22 +0200 X-ME-IP: 86.243.2.178 From: Christophe JAILLET To: Mauro Carvalho Chehab , Sakari Ailus Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET , linux-media@vger.kernel.org Subject: [PATCH] media: pxa_camera: Fix an error handling path in pxa_camera_probe() Date: Sun, 17 Sep 2023 15:47:16 +0200 Message-Id: <30e64707efd739982d3f5747ec3613e4270e7434.1694958384.git.christophe.jaillet@wanadoo.fr> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sun, 17 Sep 2023 06:48:29 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777297682440523996 X-GMAIL-MSGID: 1777297682440523996 The commit in Fixes has reordered the code and the error handling path. However one 'goto' was missed. Fix it and branch at the correct place in the error handling path. Fixes: 5073d10cbaba ("media: pxa_camera: Register V4L2 device early") Signed-off-by: Christophe JAILLET --- drivers/media/platform/intel/pxa_camera.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/intel/pxa_camera.c b/drivers/media/platform/intel/pxa_camera.c index 6e6caf50e11e..59b89e421dc2 100644 --- a/drivers/media/platform/intel/pxa_camera.c +++ b/drivers/media/platform/intel/pxa_camera.c @@ -2398,7 +2398,7 @@ static int pxa_camera_probe(struct platform_device *pdev) PXA_CAM_DRV_NAME, pcdev); if (err) { dev_err(&pdev->dev, "Camera interrupt register failed\n"); - goto exit_v4l2_device_unregister; + goto exit_deactivate; } pcdev->notifier.ops = &pxa_camera_sensor_ops;