From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (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 C94502D97B8 for ; Tue, 30 Jun 2026 20:40:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782852036; cv=none; b=fqP0KTwQCyEHJVCTt0S2wn0ECOITlH6uGkJeYN07ON2WTQt/UBpYqVW5r1HQuX++6qD8JHQcRvJS8TmLn/iuzJAGlKxcnIuf+USMjVo+Bq6ylYKzP8QjMK9R8Xy/h6J0hfSxmbqOnUZzVyQIhTonCcgm94aZ7Aol1QD3Aos/9xw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782852036; c=relaxed/simple; bh=oriBQBTr8a84UNvvlqyIlm+Y51jwPevhvSu/jb7ARSA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jVphGlAl4blqshaq4izW1WU9uPoD0lCxKXZdAt3zJRFGEYe85kuMqxKo4UB1QtdP3RBMJD3v4fmhOdrPonTGRFl7tGi43eua78GEn0NVQMkyFb3Y/uaL1C6BRLVI12Y7D1ClHgQ631kHr0oVw64NxMLI9Nn7gSAN9ZxiPJ0IAtE= 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=Q08m/iCp; arc=none smtp.client-ip=209.85.128.43 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="Q08m/iCp" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-493a54b80a5so43193095e9.2 for ; Tue, 30 Jun 2026 13:40:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782852032; x=1783456832; 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=VPH+EH1c5Z0xhuA1AJ4Duehk87nYx84oJqkH/JzJzYY=; b=Q08m/iCpxnPvLydUlRAr7PdjERvkRAKhVEalntyTSVOI70Mj1ybT4Te4QRpAhIEDXJ Pntu+0lYKGy6mwQQqVC0ysd16Lq8XIraWWHrkiFSpEQUFtcEiAvsYVyipF4hhMJtTMrn /GGaNDRkUUaNfWk/cGthmY3GnEGld1GAL9a7vPFk1o0IYdEkSNLvE5/RizzhIw8Aokq7 cRPtPSEPz2tE4nYZ7gxbkUqyRIOFX0jbq0k/QPho6zhNJA22N40SafwSc+ivgPlKp/Fl YJtl36PLHg4hCtHZxyKSB/dcg/dCUzNzmsD+v8qD/kqEQ4cVECz4Z6cTXuoYxLv87KSq EDTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782852032; x=1783456832; 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=VPH+EH1c5Z0xhuA1AJ4Duehk87nYx84oJqkH/JzJzYY=; b=f4HaLkhoo7KvW0QirsGHRVDCakHnwU99t965kznh5278VLX7Zi4mdfEbqVxNJg1nFg 6Evyr6Bdy95/kqmjCavizPHk2z69SVjWMyMg0Dj4zfqezqxqxR8va5JwUwsDSRwNAd15 tzNaUjF293Efo2g1evvH9pe84dJVNYkG91JjdSnhH4vN8dkWbKpQOmt7Babkq2+BiiLr XfS3aKvXgNsedTDdSIbDKaMSK7+RHfRZrSh5vAESqNgdXhMri3mXPeRrlwgwhDY20ENV P8NOQxhltLyWAdsrETULIt2hzGMI5ivTwrMJ4e1HCjSKaCLvCOtG1gFReZ+hX3svM7Lr 27Pg== X-Forwarded-Encrypted: i=1; AFNElJ8rHubkv5xv9MNZLo6HUDmA5LpZU0kdkBJzTrjIzKyzxqyMlat2+8peqVkJeugzhs/PsBPIb1A+heP+v4Q=@vger.kernel.org X-Gm-Message-State: AOJu0YwcYJu1ANF3AfH0HcUwhHtq7bBLrfsvTDNbE1nv7FfecsmryeFO FzVBNkovclGFTvb3e0FM86ZevQ67hH8HOlquX64ZJpLwQwzrJ2AOxQQe X-Gm-Gg: AfdE7ckSlkW1d1HK+TVYoUznvqF3PkqKHVT8cw0uvGvrJghfwED3Ery+iD1I1SfXpBA eMvTxn5IGV2lc7JLte845jEt3adGCIU67OSOiPvEF2SNHvxfIWtYXUqYdYpV62AqBR302jydyJU EqWtfPDwThzZrieD0Ke5kzWMu9nVKROOrbxxFQ7dV/sg51Jb1z7gFmZ4vsSBwtBgNJ3SaZZNF43 3QGQKjH+gj6uZQRW4311cy/r6MUb1O5XmkUSb4mLwOUA57MZmNx9cClEeg6BJ3qJSbgVyVJPQZi NEQZWLTlFsJfHoFdOvPBlo8/CCIt1b69kCKHbOdXD8QyoBrr/2xZABWlEYwHL20JrcY2dvJn7yY SFu6Tz4AFteUJO8CCRdz+XvJDlPDBw/PLJXXJJDKiNCNLMHzWBGzn7FjBodz1BtiBhHFYw4QN// 93MEpiGqgWTq/aRE7KMh8lKnUW+tm5SzEoMqJecE+mlUvALcOgShQIC+hinahq3tHBN34Q6ork X-Received: by 2002:a05:600c:8b30:b0:493:bc4a:e7d3 with SMTP id 5b1f17b1804b1-493bc4aeaa4mr46876825e9.39.1782852031843; Tue, 30 Jun 2026 13:40:31 -0700 (PDT) Received: from dohko.chello.ie (188-141-5-72.dynamic.upc.ie. [188.141.5.72]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-493bef1807asm8722295e9.1.2026.06.30.13.40.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2026 13:40:31 -0700 (PDT) From: David Carlier To: Daniel Scally , Jacopo Mondi Cc: Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, David Carlier Subject: [PATCH v2] media: mali-c55: Drop redundant mutex_destroy in capture register error path Date: Tue, 30 Jun 2026 21:40:28 +0100 Message-ID: <20260630204028.378136-1-devnexen@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit In mali_c55_register_cap_dev(), a failure of media_entity_pads_init() destroys cap_dev->lock inline and then jumps to err_destroy_mutex, which destroys the same mutex a second time. Calling mutex_destroy() twice is harmless, so this is not a bugfix, but the inline call is redundant: the err_destroy_mutex label already covers this path, just like the switch default case immediately above. Drop the inline mutex_destroy() and rely solely on the err_destroy_mutex label, so the mutex is destroyed exactly once on every error path. Signed-off-by: David Carlier Reviewed-by: Jacopo Mondi --- drivers/media/platform/arm/mali-c55/mali-c55-capture.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/media/platform/arm/mali-c55/mali-c55-capture.c b/drivers/media/platform/arm/mali-c55/mali-c55-capture.c index 7aaa5c3f7..ff0155302 100644 --- a/drivers/media/platform/arm/mali-c55/mali-c55-capture.c +++ b/drivers/media/platform/arm/mali-c55/mali-c55-capture.c @@ -857,10 +857,8 @@ static int mali_c55_register_cap_dev(struct mali_c55 *mali_c55, cap_dev->pad.flags = MEDIA_PAD_FL_SINK; ret = media_entity_pads_init(&cap_dev->vdev.entity, 1, &cap_dev->pad); - if (ret) { - mutex_destroy(&cap_dev->lock); + if (ret) goto err_destroy_mutex; - } vb2q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; vb2q->io_modes = VB2_MMAP | VB2_DMABUF; -- 2.53.0