From mboxrd@z Thu Jan 1 00:00:00 1970 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 E0B84C433F5 for ; Wed, 30 Mar 2022 11:59:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344458AbiC3MBc (ORCPT ); Wed, 30 Mar 2022 08:01:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344851AbiC3Lxm (ORCPT ); Wed, 30 Mar 2022 07:53:42 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D91B126F909; Wed, 30 Mar 2022 04:49:47 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id DD52B61625; Wed, 30 Mar 2022 11:49:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8E7BEC34111; Wed, 30 Mar 2022 11:49:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648640985; bh=qyc5E1VsAiEkog/l7n77XDh8NAl9OUtNeFvCzuC5lPg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GxIkpx/cCphyp4nV3F9tMmg13W0Kn7I5US5XrXpLfnrFRmo+yVXDgBVQQ1XjMTrAN 4ffw0sJ1NTv9MmiqVztWo/uQF21wcwLZw3K6lkXGxlJIcvehFwJbZMt15zS0IuLIOo b8Y1n0GcbsFycepn9MSD/IhsIMnuwsG+oi/HVhPorOa8LQ8ZdeFdKxL3Nn5P9KusHO 6kMZrsCrfE0JniDIor7rT5cDkva6+bBm5v0DdkqvX5tib+xCaoy6/MdjTjLYCFEBUN ylhw2TZIBovY2vk/NMYzNComvBfmOs6bDYdJVggLX24yCQgtHrAV8I6LmD1pTyoPST 8zIzZHKYxWaSA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hans de Goede , Paul Kocialkowski , Sakari Ailus , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 5.16 47/59] media: i2c: ov5648: Fix lockdep error Date: Wed, 30 Mar 2022 07:48:19 -0400 Message-Id: <20220330114831.1670235-47-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220330114831.1670235-1-sashal@kernel.org> References: <20220330114831.1670235-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hans de Goede [ Upstream commit d4cb5d3c4cee28aa89b02bc33d930a6cf75e7f79 ] ov5648_state_init() calls ov5648_state_mipi_configure() which uses __v4l2_ctrl_s_ctrl[_int64](). This means that sensor->mutex (which is also sensor->ctrls.handler.lock) must be locked before calling ov5648_state_init(). ov5648_state_mipi_configure() is also used in other places where the lock is already held so it cannot be changed itself. Note this is based on an identical (tested) fix for the ov8865 driver, this has only been compile-tested. Cc: Paul Kocialkowski Reviewed-by: Paul Kocialkowski Signed-off-by: Hans de Goede Signed-off-by: Sakari Ailus Signed-off-by: Sasha Levin --- drivers/media/i2c/ov5648.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/media/i2c/ov5648.c b/drivers/media/i2c/ov5648.c index 947d437ed0ef..01e22c535267 100644 --- a/drivers/media/i2c/ov5648.c +++ b/drivers/media/i2c/ov5648.c @@ -1778,8 +1778,14 @@ static int ov5648_state_configure(struct ov5648_sensor *sensor, static int ov5648_state_init(struct ov5648_sensor *sensor) { - return ov5648_state_configure(sensor, &ov5648_modes[0], - ov5648_mbus_codes[0]); + int ret; + + mutex_lock(&sensor->mutex); + ret = ov5648_state_configure(sensor, &ov5648_modes[0], + ov5648_mbus_codes[0]); + mutex_unlock(&sensor->mutex); + + return ret; } /* Sensor Base */ -- 2.34.1