From patchwork Mon Feb 17 14:01:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cameron X-Patchwork-Id: 13977887 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3D98A22083 for ; Mon, 17 Feb 2025 14:02:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739800925; cv=none; b=cW4X4ZX1v0Q2DARxhureqwpg8Vmy4Z7Pa95dHLyOvfn3Nnm/DT53HvVG4NEVtm9VIND0qafsOGJfLGAfHnVjzXSTUMK8aTJ3MmFmBhwu37nT+9PgOl0gEWH5QpWsMbm3x7I4Ox9ZKj+w9RcdIIHSKN/MYrg8al6bWM1sbbgTNtM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739800925; c=relaxed/simple; bh=y9VE+ZEV5hCgOGF9cwbOhXg+P4NQ668KiYiBQkxv1JY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=R4zScMmmP7ukWNkovE7lxyiyCMnms9UQVNq7UYcTUEi8xA4SbSTygsxJwYO6aRCKcQbWpJjJBSLOQydiMHGFUh+Jok/NxtRWBkvpU2li7P2lbolEHqaDdeiHzxq4DuVGyvFYaHVc3iUwTEDBwE+x8hBZEUh8b9CTdsFlYy7RsB0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NivGfufy; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="NivGfufy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9F561C4CED1; Mon, 17 Feb 2025 14:02:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739800924; bh=y9VE+ZEV5hCgOGF9cwbOhXg+P4NQ668KiYiBQkxv1JY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NivGfufy+HgEGQGF0LFxC2XdJwicqDD7TBLf7t1de0hVbZdkkC3IY8ubWGwy2N2Fw H0BDXsQFU/rL9W6C506WYtI792fmqV1Z7uZehMQujhb5dLd4w23m5ufC66RnJU0BNk 0bTrT/mvt82adunwP7Vco2XVfEuH6aw7SKc1QOat4IfxMoipuq22KDuW3aFihaZIX+ z7yRgwA5PdIjoigGehsBQ7S3K+dpQl4f4fSyvE/dZRhgjBQ2GNXepHyMkK+UosZviM FCEoqIKwqeTfzReHpUromApHUg5qYaa2K/BbWzW7ngap7oggG98JIQO/j3dEnQehiB l+1UdGSOwXFMA== From: Jonathan Cameron To: linux-iio@vger.kernel.org Cc: David Lechner , =?utf-8?q?Nuno_S=C3=A1?= , Antoniu Miclaus , Matti Vaittinen , Jonathan Cameron Subject: [PATCH 6/8] iio: accel: msa311: Fix failure to release runtime pm if direct mode claim fails. Date: Mon, 17 Feb 2025 14:01:33 +0000 Message-ID: <20250217140135.896574-7-jic23@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250217140135.896574-1-jic23@kernel.org> References: <20250217140135.896574-1-jic23@kernel.org> Precedence: bulk X-Mailing-List: linux-iio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Jonathan Cameron Reorder the claiming of direct mode and runtime pm calls to simplify handling a little. For correct error handling, after the reorder iio_device_release_direct_mode() must be claimed in an error occurs in pm_runtime_resume_and_get() Fixes: 1ca2cfbc0c33 ("iio: add MEMSensing MSA311 3-axis accelerometer driver") Signed-off-by: Jonathan Cameron --- drivers/iio/accel/msa311.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/drivers/iio/accel/msa311.c b/drivers/iio/accel/msa311.c index fe4c32a9558a..7f4ab7cdbc4a 100644 --- a/drivers/iio/accel/msa311.c +++ b/drivers/iio/accel/msa311.c @@ -594,23 +594,25 @@ static int msa311_read_raw_data(struct iio_dev *indio_dev, __le16 axis; int err; - err = pm_runtime_resume_and_get(dev); + err = iio_device_claim_direct_mode(indio_dev); if (err) return err; - err = iio_device_claim_direct_mode(indio_dev); - if (err) + err = pm_runtime_resume_and_get(dev); + if (err) { + iio_device_release_direct_mode(indio_dev); return err; + } mutex_lock(&msa311->lock); err = msa311_get_axis(msa311, chan, &axis); mutex_unlock(&msa311->lock); - iio_device_release_direct_mode(indio_dev); - pm_runtime_mark_last_busy(dev); pm_runtime_put_autosuspend(dev); + iio_device_release_direct_mode(indio_dev); + if (err) { dev_err(dev, "can't get axis %s (%pe)\n", chan->datasheet_name, ERR_PTR(err)); @@ -756,10 +758,6 @@ static int msa311_write_samp_freq(struct iio_dev *indio_dev, int val, int val2) unsigned int odr; int err; - err = pm_runtime_resume_and_get(dev); - if (err) - return err; - /* * Sampling frequency changing is prohibited when buffer mode is * enabled, because sometimes MSA311 chip returns outliers during @@ -769,6 +767,12 @@ static int msa311_write_samp_freq(struct iio_dev *indio_dev, int val, int val2) if (err) return err; + err = pm_runtime_resume_and_get(dev); + if (err) { + iio_device_release_direct_mode(indio_dev); + return err; + } + err = -EINVAL; for (odr = 0; odr < ARRAY_SIZE(msa311_odr_table); odr++) if (val == msa311_odr_table[odr].integral && @@ -779,11 +783,11 @@ static int msa311_write_samp_freq(struct iio_dev *indio_dev, int val, int val2) break; } - iio_device_release_direct_mode(indio_dev); - pm_runtime_mark_last_busy(dev); pm_runtime_put_autosuspend(dev); + iio_device_release_direct_mode(indio_dev); + if (err) dev_err(dev, "can't update frequency (%pe)\n", ERR_PTR(err));