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 A931635BDD5 for ; Sun, 26 Apr 2026 12:59:38 +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=1777208379; cv=none; b=DfNRqAXKjbcvaxvZnMe4QD6PQ8SQp30VslnbBGGxBQaohZFW0x8rC5dGxvJvqoS2oVjsp+kdeasVTavh/AvwIXmOLgoE7FXvNMPviAA2F248z9pNnzdYUBhCZ+5bHZbMh+mb9jwMB0hUfgfvWFuqWygFSf0Jbfd8q6NJzlXBtD0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777208379; c=relaxed/simple; bh=GS6hajXwZat+NBSlsYlaHhAw7w0PBNcSVaczRpYLUFc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=o5MnA/tPr7BlRahkQ4FcVKvx+Nwu2N7ipu07FBn6LU8frgnbmbGuoSamhjXBGvVAcpFc93JmoysXIV+yCIs3uIGwydb3G8E/p6x++Bs2Ok4viCKqbf7+FMSDBbIC3jm815RhhcUU9p8leUif+l5k5/U+E7riUL38ITDr7rBY3As= 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=Ku8FJ+D4; 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="Ku8FJ+D4" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2ad9a9be502so58123545ad.0 for ; Sun, 26 Apr 2026 05:59:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777208378; x=1777813178; 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=XTPTOzgWIzvWPxNyi6nl7Pu4rXDNr+FjMwz85mVxP+Q=; b=Ku8FJ+D4yfEfn7weq5k/SaTK3+sf01O0n25RZCsD3bFGLCs11JeEqnZzg2HwHpSje2 NEAuNr/2bk/QO82efWtxhoaB0y+6054aTvSpn+MjOvr1rnBEukf1ha1T6/6Dy4eDebeA 4sBj+JdYrxfF3Jfpc9LlsYl+HEfsMbJH0Q87SuvzfPvCHom+qHOpiVsfHrfFJ+GSogac WTppz9BASON1TiCR3q9EqCLw5kay8DgrewszZxKKsd2U6lLPL8mzp6OXYTW0PGK/cntQ 3No+1llNSGJCDwwrCgxtr14zz+bekcSCH3YJCMk9Fi5lLb46YlvoPk+9rzlPUe7aeD7t kBgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777208378; x=1777813178; 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=XTPTOzgWIzvWPxNyi6nl7Pu4rXDNr+FjMwz85mVxP+Q=; b=Gy/L5ZOdAqScUFejP+IapfdJHuOlcJPqCs3l/UD+Rf/KqPJTgzsxug8vqiQQvl5U+4 a5wZeABEi7h+h0rEERXyB4psTo7YfPqMetJU9GGzYb528bGca1jz1iEJ5SSwYhKORiod Iu1asvMVXiNbdj/anmwjYrcxpo5liZ3e3sSvbwElRaCtaj6dyEWC9lvXU5HjZSQE5UID 3bXjkRnznXrx6J7g3ce78SzXIflsHJ+R6Frv9N4Ga3YMGtgGQRdiY7Y7lcqjozYDsAHj nvqJIdRDRxELk/4pU0QxmQJiCtVLYRhRf/SlMlVR4yIGLIN+kGf8ZNNkJzG6uSH4JQXE cJFQ== X-Forwarded-Encrypted: i=1; AFNElJ/tvOBCDlbW4dx6Ag48Uc/3rOCodfOSKhOOLdFaPrHsvO8C7SjABG6tFd0aOPWEzf9hjLwG9JgNzMW8EMg=@vger.kernel.org X-Gm-Message-State: AOJu0YzYP+P2NOb2uchqfcxeIQfX94qJuNFsQ01I1mCnZI4Rg9I5mILm Yzbs3RpikP7lFNJUJN0g9Ifl3dGg+/x26Cw4qaIlCPa31U9Q2DKGofM= X-Gm-Gg: AeBDietOekfcONtejL4auond5WXWmG8L9o2gtHaap0UbWyX9WvvRFAyPQN2CDzxVRau QrUEnbb/tUXJSW0Xsgs2WJJoGz67fC/QcfPf/4zbq057i2l30e91jvYjwXERpVVSnUJ9pSi8x7H Ss711JR2YAGLZbEe8zyv0TUiB67q6CX+zFh7pbSrCGI9vF6kEYjtua5pJ0UU7i/z4N8JRFnjcLh Ctkn9AkqVy+P7hezxhFAsDVltkbqrfodxCcaXeBL4eX8M/903mXjxSyWP7OnZQ0YB5cELmTxDlP lubyghxnW7dI1aQcnqKXvEV1cB12vDCO/7w5mjmDf6BRfYnZ1vBV9bWGe/qpgpOZ8b8m0g7A2Hn 8c4+TT9Yw3FuB2qxBClRYSy/Pcq3exkMkcYoxdrRnQILzJ1IJ3xz67uftPEhZqcPf8O5Hv9UiGj ecSPWiFYDcyyyjZCW4Gou3Ri3TOkW8eXpy+B5z/BIlGMLQpWgl7CqvVb14GsfvM3Toyer3xQjuX nUADHqG+Q== X-Received: by 2002:a17:903:17cf:b0:2b0:6829:9414 with SMTP id d9443c01a7336-2b5f9e64c6cmr396098325ad.8.1777208378015; Sun, 26 Apr 2026 05:59:38 -0700 (PDT) Received: from localhost.localdomain ([1.226.165.54]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b5fab20c6asm252710075ad.58.2026.04.26.05.59.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 26 Apr 2026 05:59:37 -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] media: sun4i-csi: Clean up media device on probe errors Date: Sun, 26 Apr 2026 21:59:11 +0900 Message-ID: <20260426125917.53665-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 --- drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c | 30 ++++++++++++++-------- 1 file changed, 19 insertions(+), 11 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..f6798cf0a2 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,13 +244,13 @@ 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) @@ -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;