From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 251FD2C08D0 for ; Sat, 2 May 2026 06:12:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777702362; cv=none; b=TH5FutpXQXq4Sp8J0OUDAFnGZ0k8C2y5CnnUU7ium88fEsXXXM4AnEbCH5NCCPwSuBdbc9pw4Z6yqsL0h+j28OLpqoBAujfi7S40b4IZM6iUyN4QB0WWxTxvCwuJmmRGQ2Njhszp5AiUc18fsfjxoJKS9yFR5g6w7RagyXdKrGg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777702362; c=relaxed/simple; bh=TueC70Q2BnjUS5mq/ZnFlpCzcBfCUG4Cw+8Fdn9sjoM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=CfVMePH1VZIPYXM5C6co0xtM6/kRKxEqdWHrWuxaS50u77sZkKKdgcx87jJwgC5vQU5VCgvFTcvVcGxs6jtbZCgqTqip95DQJkoDRT6HjoLVZ7Hu0mgiQXsJ/uAVyF1pde6nQRr//RNwRI37VvKdCaJRDLQLI8jJMqLdAVADVGw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ZSXFEZx/; arc=none smtp.client-ip=209.85.214.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZSXFEZx/" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2ad9516a653so12115765ad.0 for ; Fri, 01 May 2026 23:12:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777702359; x=1778307159; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Szko83JYninv8P7/ry56S2EbzBdJ5J0YLPwpoWRzN10=; b=ZSXFEZx/Jtt1Az/FVfeSvG0nhpl0jfYVMoMJF/bYejJ6tlhblOFl/rA2GbjPftIghX DA2sggKwpccnrKx8bfs7f7XzEK6g1A2JQQ73UFS53xBdOniadhekCk3KEdL7F2cD229P vlrYHkhAV9vMRMOuycUDonQfvpxbcERGgWMUm+u9HW3nYUC/EH3rfQBXluJr3MkCE8Vi WseNZgtgvnQZfE1DpqQu1s99Rs5eZFbcgY0QLT03oAYCxgHsON46RVg6lffdIILJzdtE G/EjApkZTMdFfBsQte0MDQ9IlU/pYOM15ULHGmqgsztNVczQlYj5nK3eBrMzdw1Z+5py z46g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777702359; x=1778307159; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Szko83JYninv8P7/ry56S2EbzBdJ5J0YLPwpoWRzN10=; b=cvfUSuyl/FUY7kkUNJQuFtQSE0712y+Oa2inUTU2/yC9mxTsN+ER2V1BRszqKJ0vdF AbqFLp/qzVWhZdJqiWvDWzvwPQmqnMgBZ7u80SJX8WTx55A3fFJxgm3WABNE19a4vLE6 zcjr4SST786Vq+dTqvSJrKldbmz3POx02LrFP9/OPT3ev+NkpjMDIkikx17AktP4NtMS m1DBdcMr+sjPgB+3WCheEZOvaONE9VI8CrF9YX94+l/bsKfT7+S0NOp3gLnd/P8k2hc6 dQuUZgaqa/glSXdpE+JLAYtBc8pj+smhu5Sk1hh/ttSjNEaPRhnENWcu4limtOYgwV5I tyYg== X-Forwarded-Encrypted: i=1; AFNElJ/D7SfuwddkfHlIzfZCwlGKPWXbPQTeGoHgWE2VIDO3sLEo0JVGr2pJBA+DGy7c9B/zHNqhVDamqSQe+LU=@vger.kernel.org X-Gm-Message-State: AOJu0Ywg9Msn11mctXXVjEStVJqtvCfmiwmuqq7wXWkanmKQt//ruHQ5 WRPAaesGbFktzt8jHc6nLxZWMIoogXagy/+yGuBJDwhYXyIPeU+gCek= X-Gm-Gg: AeBDieu12yWa8pJOGK89vMV+ZeppdrAkAQQGEITwa2vvn9tXOfol0++bXCZSvc7tDYx RICkzUhBJ0d5DrXtsNrHmi3yQAtmsxCZIqU0BwL2ZFApu2T2Dm4N9OKhPGwuuCzgAlnMo9Zg5B3 uGGjuYUPKf0GbPIT0BKnIo7tTOINyvf5AdibbG1Rwxa9hUPCwcDNYvpsLtG4xDhDm5SPzIsANqD pWGPyd+QIiZfpUpOCgHCblZKU2Kn91atszQw4ujPVBZKATNF8FOkZ8Ym0dk0wd18CV0oAL5F8Wc vBWtpoNXGftStTJ2MtvkdUA1O4Mh5lgiaESTxxSBWjqKX98ZnZRy8foAGpzwSfW/EUfAOTifQmd lP97CmrRTo8+Jigp5qezYUyvFiUO806CNgrxgLtz74IxaPpyDEAIwWsbooFogwWpsWz8hp1LbHD Q8gSMymBfyjHj6XE1QzJ2jMzMH+EW9cRGlp9E++QIIvFgmQZkGObjReopSo6Tv+fVK6nmCxjHzM lhvaIoIQQ== X-Received: by 2002:a17:903:3847:b0:2b0:9101:1b77 with SMTP id d9443c01a7336-2b9f2586e79mr19418775ad.17.1777702359380; Fri, 01 May 2026 23:12:39 -0700 (PDT) Received: from localhost.localdomain ([1.226.165.54]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b9cae54860sm37981415ad.72.2026.05.01.23.12.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 01 May 2026 23:12:38 -0700 (PDT) From: Myeonghun Pak To: Maxime Ripard , Mauro Carvalho Chehab Cc: Myeonghun Pak , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Ijae Kim Subject: [PATCH v2] media: sun4i-csi: clean up media device on probe errors Date: Sat, 2 May 2026 15:12:25 +0900 Message-ID: <20260502061231.50473-1-mhun512@gmail.com> X-Mailer: git-send-email 2.47.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit sun4i_csi_probe() initializes the media device before acquiring the MMIO resource, IRQ, clocks, reset control and media entity pads. Several of those failure paths return directly. media_device_cleanup() is still required after media_device_init(), and a failed probe does not run the driver remove callback. Route those errors through the existing media-device cleanup path before returning. Co-developed-by: Ijae Kim Signed-off-by: Ijae Kim Signed-off-by: Myeonghun Pak --- Changes in v2: - Fix the remaining sun4i_csi_dma_register() error path to use the renamed media-device cleanup label, fixing the build failure reported by Media CI. drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c | 32 ++++++++++++++-------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c b/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c index e53a07b770..a504a1c78e 100644 --- a/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c +++ b/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c @@ -187,37 +187,45 @@ static int sun4i_csi_probe(struct platform_device *pdev) csi->v4l.mdev = &csi->mdev; csi->regs = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(csi->regs)) - return PTR_ERR(csi->regs); + if (IS_ERR(csi->regs)) { + ret = PTR_ERR(csi->regs); + goto err_clean_mdev; + } irq = platform_get_irq(pdev, 0); - if (irq < 0) - return irq; + if (irq < 0) { + ret = irq; + goto err_clean_mdev; + } csi->bus_clk = devm_clk_get(&pdev->dev, "bus"); if (IS_ERR(csi->bus_clk)) { dev_err(&pdev->dev, "Couldn't get our bus clock\n"); - return PTR_ERR(csi->bus_clk); + ret = PTR_ERR(csi->bus_clk); + goto err_clean_mdev; } if (csi->traits->has_isp) { csi->isp_clk = devm_clk_get(&pdev->dev, "isp"); if (IS_ERR(csi->isp_clk)) { dev_err(&pdev->dev, "Couldn't get our ISP clock\n"); - return PTR_ERR(csi->isp_clk); + ret = PTR_ERR(csi->isp_clk); + goto err_clean_mdev; } } csi->ram_clk = devm_clk_get(&pdev->dev, "ram"); if (IS_ERR(csi->ram_clk)) { dev_err(&pdev->dev, "Couldn't get our ram clock\n"); - return PTR_ERR(csi->ram_clk); + ret = PTR_ERR(csi->ram_clk); + goto err_clean_mdev; } csi->rst = devm_reset_control_get(&pdev->dev, NULL); if (IS_ERR(csi->rst)) { dev_err(&pdev->dev, "Couldn't get our reset line\n"); - return PTR_ERR(csi->rst); + ret = PTR_ERR(csi->rst); + goto err_clean_mdev; } /* Initialize subdev */ @@ -236,17 +244,17 @@ static int sun4i_csi_probe(struct platform_device *pdev) ret = media_entity_pads_init(&subdev->entity, CSI_SUBDEV_PADS, csi->subdev_pads); if (ret < 0) - return ret; + goto err_clean_mdev; csi->vdev_pad.flags = MEDIA_PAD_FL_SINK | MEDIA_PAD_FL_MUST_CONNECT; vdev->entity.ops = &sun4i_csi_video_entity_ops; ret = media_entity_pads_init(&vdev->entity, 1, &csi->vdev_pad); if (ret < 0) - return ret; + goto err_clean_mdev; ret = sun4i_csi_dma_register(csi, irq); if (ret) - goto err_clean_pad; + goto err_clean_mdev; ret = sun4i_csi_notifier_init(csi); if (ret) @@ -266,7 +274,7 @@ static int sun4i_csi_probe(struct platform_device *pdev) media_device_unregister(&csi->mdev); sun4i_csi_dma_unregister(csi); -err_clean_pad: +err_clean_mdev: media_device_cleanup(&csi->mdev); return ret;