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: 724570 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 89993CD13CF for ; Sun, 17 Sep 2023 13:48:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234761AbjIQNrh (ORCPT ); Sun, 17 Sep 2023 09:47:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236022AbjIQNr3 (ORCPT ); Sun, 17 Sep 2023 09:47:29 -0400 Received: from smtp.smtpout.orange.fr (smtp-29.smtpout.orange.fr [80.12.242.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 711ED11D 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 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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;