From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 32A433955F0 for ; Sun, 14 Jun 2026 16:58:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781456295; cv=none; b=sHl8Gri3bN4OPAVRpU8HZgsUgrn2BBp5S0NXNGOXtjO3trSjGGhroXhnmEdLLO2QI01jyBvDeAGvdTw/NZ3bNeWwKXWvGc0YudsxU4kkIwnVCMT3VaMji1xEi2EKmj84cRZH39OVdew6/1wIrCFL07XC2rSi4g2N3y1FyBM4pig= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781456295; c=relaxed/simple; bh=599zfZJAbkNxw78NPn5+kftBT5//9rsCPa8h0I//JL8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VwWPWX9YcYnkm68AGtAgi1gcnOzYIA5FJiGbwqojSa28eEKODnDHo/ngdTkyzsk1zaC4MfUlWZX69LLo/pn4cqL6lrztpnl/t6lp9g9iqu7GxscxCvoAVA4pU0M7+q2N1trrkP6R1SYE1kxTpzpTkAxBd9zOdi5Vv8ICQ/LNFyg= 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=oKW19Syg; arc=none smtp.client-ip=209.85.214.175 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="oKW19Syg" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2bf0ddaf50fso14427415ad.1 for ; Sun, 14 Jun 2026 09:58:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781456293; x=1782061093; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zc350Z+XHNdEgykOHsnv64mPEa8jP1PjaQAzRbsUDG0=; b=oKW19SygHSpU724lB08rMYd0zSd01MJoRXO6myqIvrtuP/VhNltXUDQF6iFL5je7k0 w5l2mAjmyog+kyjS7ybujVSrh91huCRpTlPdRdDmD7MkN3FkcbtdNwxsk40QM3TrJdRx upNM6TM63+BbSghKLttX1DGlArfj+ABYsHJ75xD7oV7+trJiAaIb9shRsTdRQUrevENZ jzsmixdgUbvl6X80z2tK8Axu7NOrkv43aXVmI+I/iIlM1py4N8ukoVkiAi04CR4dQK2U e5jmpcFcdM3dPUqZR7LvaBF9r3oqzfx2dal5wWUSqYxTsJcfd8jBeyG8QqWOc8S/Noth DYSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781456293; x=1782061093; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=zc350Z+XHNdEgykOHsnv64mPEa8jP1PjaQAzRbsUDG0=; b=dn3lU8/RojuNcZN+UCt4cL7Z0qHpsN1diRsG34z1BvFMDL0+1fKRC9MhmREWVsn1f3 IgOkYJ61TviI9q4uuwomJsmeT7rYiIK9jRg8Wt6NSpUAJxFTgVwheluz8yYoMwYttkR/ cl0UJ+lgRu4QAZFa3PbAv9/vFQg3WhH6JcPt/iFikkiFoVgkeeFyxfeFyr14yUS5q1VD w1syR4yW9DFKLzy6J7RknZdu4pZSanmxsMZ9EprXjBZgSlBoq01geX1ZygQfJj3T5QmD 1lt/UA8UkdYAzO7QwxBT4hWsHRPGUUOzZCeDScuXXc3UdrN6V1GEuyJ4+V0wbzQXPVrP L8ig== X-Forwarded-Encrypted: i=1; AFNElJ9yt92lC1BgPntxML+SwevhctNJw4JqmbKn3/88ggAFs8//iEkz8cB8BFKH0qT0KrGsOtcWTqTqe6ySt40=@vger.kernel.org X-Gm-Message-State: AOJu0YwRFeI/iY4eccS+3nPpHCKz/77J3xxEsZRLUd/Zao7oS+kd2N2G idsh7F31ZPwvt44uchCKNU5vOyEX0j3U6ZY0+qZBswBtFRjuNFzVKZm6 X-Gm-Gg: Acq92OE13dqBciKvvkH5fna0qW1HIgWBuU5q8LJ6K2nr5HqdrAqcE+eSqou99XEltZc AvtFblA5aNAWTiAxnGK2pGkLnbZR/OvsWvD3Yugt+gwdPxNLDMyRthGQvuUQdiatHEfhg3PHB02 hi1QrscjdTGyZ0vw35Qt2E7G7omro9Rai0AER60o/bJ+4d5aPRLoGiO3JGdvA9I6ZJCipl5CUTa +IwPh9clCOZPN6Gf2lvYczHLyIGKjac98i/Yw3eHHcoVR5UKgN0nJFFBaWVvpfxzD+zXuu/dKEX 7+2LaD7L0K4Oo3+bTOo0IKnIzUGnF2un/gbDIg5oD2x504RkdSeVN1qSP975DlUP/LIhG1wuE0+ wO7Eto51izlvIkw94qZHKZrTDFdr78/teH06ye2WVgSXjr7ATRwxDxnuMnKthPCWStdZJhfSgWz IIiDmkwH3chBt17hauZBu61Pb5yxwckwbdkn1BB6BQTuLBAOTPHyzNAndZPfmzrIk= X-Received: by 2002:a17:903:298c:b0:2bf:1486:e6bc with SMTP id d9443c01a7336-2c664209c86mr79258855ad.29.1781456293525; Sun, 14 Jun 2026 09:58:13 -0700 (PDT) Received: from localhost.localdomain ([49.207.217.37]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c42f2e5590sm85284025ad.14.2026.06.14.09.58.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 14 Jun 2026 09:58:13 -0700 (PDT) From: Biren Pandya To: linux-media@vger.kernel.org, mchehab@kernel.org Cc: Biren Pandya , linux-kernel@vger.kernel.org Subject: [PATCH 18/22] media: usb: cx231xx: Add missing media_entity_cleanup() Date: Sun, 14 Jun 2026 22:25:55 +0530 Message-ID: <20260614165630.3896-19-birenpandya@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260614165630.3896-1-birenpandya@gmail.com> References: <20260614165630.3896-1-birenpandya@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The media_entity_pads_init() (or media_entity_init()) function initializes the media entity, but the driver forgets to call media_entity_cleanup() in the error paths and remove function. Add the missing calls to fix the API violation and prevent potential future memory leaks. Signed-off-by: Biren Pandya --- drivers/media/usb/cx231xx/cx231xx-video.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/media/usb/cx231xx/cx231xx-video.c b/drivers/media/usb/cx231xx/cx231xx-video.c index 2cd4e333bc4b..2b1ad969e58c 100644 --- a/drivers/media/usb/cx231xx/cx231xx-video.c +++ b/drivers/media/usb/cx231xx/cx231xx-video.c @@ -1006,8 +1006,10 @@ void cx231xx_v4l2_create_entities(struct cx231xx *dev) pr_err("failed to initialize input pad[%d]!\n", i); ret = media_device_register_entity(dev->media_dev, ent); - if (ret < 0) + if (ret < 0) { pr_err("failed to register input entity %d!\n", i); + media_entity_cleanup(ent); + } } #endif } @@ -1558,6 +1560,7 @@ void cx231xx_release_analog_resources(struct cx231xx *dev) video_device_node_name(&dev->vbi_dev)); video_unregister_device(&dev->vbi_dev); } + media_entity_cleanup(&dev->vbi_dev.entity); if (video_is_registered(&dev->vdev)) { dev_info(dev->dev, "V4L2 device %s deregistered\n", video_device_node_name(&dev->vdev)); @@ -1567,6 +1570,7 @@ void cx231xx_release_analog_resources(struct cx231xx *dev) video_unregister_device(&dev->vdev); } + media_entity_cleanup(&dev->vdev.entity); v4l2_ctrl_handler_free(&dev->ctrl_handler); v4l2_ctrl_handler_free(&dev->radio_ctrl_handler); } @@ -1839,6 +1843,7 @@ int cx231xx_register_analog_devices(struct cx231xx *dev) dev_err(dev->dev, "unable to register video device (error=%i).\n", ret); + media_entity_cleanup(&dev->vdev.entity); return ret; } @@ -1895,6 +1900,7 @@ int cx231xx_register_analog_devices(struct cx231xx *dev) vbi_nr[dev->devno]); if (ret < 0) { dev_err(dev->dev, "unable to register vbi device\n"); + media_entity_cleanup(&dev->vbi_dev.entity); return ret; } -- 2.50.1 (Apple Git-155)