From mboxrd@z Thu Jan 1 00:00:00 1970 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 22EEE2253EC; Thu, 12 Dec 2024 16:11:58 +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=1734019918; cv=none; b=ip+fv6w0bo6yZNJcp7ZcSZ4lJo0Y0N/KNnGFHjnwjG99HIoz5WdQ5lK5BCUvj0KgqgKmwKkJ5fSRv/iza9XE6PyAHvR8GZ3yPMycOaPM2xkqVWZKIDQkPhO9q8PtfBZ2g7Ub4FZylNOAc5w1X1+0xpii2QT/i9BYIJ5nGyzQVnE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734019918; c=relaxed/simple; bh=QHxFY6zcDqAX9cghiE8DdapD50Wh+MO6wQX9AuPAlHQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NAUSdR5Qbm/RSsa3RtX03PLvgNPt7AMzp1n3awrNQj+Ird8AhG9+L+YtbAiN4bHY5eO0RzKTjV53xq9eAjFY/umXI6vXEcJ1B1oqZ8cdV0zNVwodk2knWe9bMT5ukGaT5dscAM6cBIVctukkw2zsUV9+RXM8Sgj71RbKhQeP1XE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=X3cXiRhK; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="X3cXiRhK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 82AF8C4CECE; Thu, 12 Dec 2024 16:11:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734019918; bh=QHxFY6zcDqAX9cghiE8DdapD50Wh+MO6wQX9AuPAlHQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X3cXiRhKy/JnLISXkJztudXtoY1bimyJBEVOoKTCjn1Sqd7gaCjStnLBi6/Hw43uO K6dFA5kjJiCQ3/rrKVf+vS0KuYqctYDv9Se1X0ETvJteufu5etMsG5seQ0dc3FLSe5 fMYf+e3zGM4Wa+xHi1UHyhDKizGlksLAfs/DRtTo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jinjie Ruan , Sasha Levin Subject: [PATCH 6.1 331/772] misc: apds990x: Fix missing pm_runtime_disable() Date: Thu, 12 Dec 2024 15:54:36 +0100 Message-ID: <20241212144403.577701786@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144349.797589255@linuxfoundation.org> References: <20241212144349.797589255@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jinjie Ruan [ Upstream commit 3c5d8b819d27012264edd17e6ae7fffda382fe44 ] The pm_runtime_disable() is missing in probe error path, so add it to fix it. Fixes: 92b1f84d46b2 ("drivers/misc: driver for APDS990X ALS and proximity sensors") Signed-off-by: Jinjie Ruan Link: https://lore.kernel.org/r/20240923035556.3009105-1-ruanjinjie@huawei.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/misc/apds990x.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/misc/apds990x.c b/drivers/misc/apds990x.c index e2100cc42ce86..668609d22fe18 100644 --- a/drivers/misc/apds990x.c +++ b/drivers/misc/apds990x.c @@ -1148,7 +1148,7 @@ static int apds990x_probe(struct i2c_client *client, err = chip->pdata->setup_resources(); if (err) { err = -EINVAL; - goto fail3; + goto fail4; } } @@ -1156,7 +1156,7 @@ static int apds990x_probe(struct i2c_client *client, apds990x_attribute_group); if (err < 0) { dev_err(&chip->client->dev, "Sysfs registration failed\n"); - goto fail4; + goto fail5; } err = request_threaded_irq(client->irq, NULL, @@ -1167,15 +1167,17 @@ static int apds990x_probe(struct i2c_client *client, if (err) { dev_err(&client->dev, "could not get IRQ %d\n", client->irq); - goto fail5; + goto fail6; } return err; -fail5: +fail6: sysfs_remove_group(&chip->client->dev.kobj, &apds990x_attribute_group[0]); -fail4: +fail5: if (chip->pdata && chip->pdata->release_resources) chip->pdata->release_resources(); +fail4: + pm_runtime_disable(&client->dev); fail3: regulator_bulk_disable(ARRAY_SIZE(chip->regs), chip->regs); fail2: -- 2.43.0