FAILED: patch "[PATCH] crypto: atmel-sha204a - fail on hwrng registration error in" failed to apply to 6.12-stable tree
[email protected]
maintainerThe patch below does not apply to the 6.12-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.12.y
git checkout FETCH_HEAD
git cherry-pick -x 49e05bb00f2e8168695f7af4d694c39e1423e8a2
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026071522-confiding-outhouse-33b6@gregkh' --subject-prefix 'PATCH 6.12.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 49e05bb00f2e8168695f7af4d694c39e1423e8a2 Mon Sep 17 00:00:00 2001
From: Thorsten Blum <[email protected]>
Date: Sun, 17 May 2026 18:27:40 +0200
Subject: [PATCH] crypto: atmel-sha204a - fail on hwrng registration error in
probe path
Commit 13909a0c8897 ("crypto: atmel-sha204a - provide the otp content") overwrote the hwrng registration return value when creating the sysfs group, which allowed atmel_sha204a_probe() to succeed even if devm_hwrng_register() failed.
Return immediately when devm_hwrng_register() fails, and report both hwrng and sysfs registration errors with dev_err(). Adjust the sysfs error log message for consistency.
drivers/crypto/atmel-sha204a.c +5 -3
@@ -183,12 +183,14 @@ static int atmel_sha204a_probe(struct i2c_client *client) i2c_priv->hwrng.quality = *quality; ret =devm_hwrng_register (&client->dev, &i2c_priv->hwrng); -if (ret) -dev_warn (&client->dev,"failed to register RNG (%d)\n" , ret); +if (ret) { +dev_err (&client->dev,"failed to register RNG (%d)\n" , ret); +return ret; + } ret =sysfs_create_group (&client->dev.kobj, &atmel_sha204a_groups);if (ret) { -dev_err (&client->dev,"failed to register sysfs entry\n" ); +dev_err (&client->dev,"failed to create sysfs group (%d)\n" , ret);return ret; }
Sasha Levin
maintainerPATCH 1/1 crypto: atmel-sha204a - fail on hwrng registration error in probe path
From: Thorsten Blum <[email protected]>
[ Upstream commit 49e05bb00f2e8168695f7af4d694c39e1423e8a2 ]
Commit 13909a0c8897 ("crypto: atmel-sha204a - provide the otp content") overwrote the hwrng registration return value when creating the sysfs group, which allowed atmel_sha204a_probe() to succeed even if devm_hwrng_register() failed.
Return immediately when devm_hwrng_register() fails, and report both hwrng and sysfs registration errors with dev_err(). Adjust the sysfs error log message for consistency.
--- drivers/crypto/atmel-sha204a.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/crypto/atmel-sha204a.c +5 -3
@@ -178,8 +178,10 @@ static int atmel_sha204a_probe(struct i2c_client *client) i2c_priv->hwrng.quality =1 ; ret =devm_hwrng_register (&client->dev, &i2c_priv->hwrng); -if (ret) -dev_warn (&client->dev,"failed to register RNG (%d)\n" , ret); +if (ret) { +dev_err (&client->dev,"failed to register RNG (%d)\n" , ret); +return ret; + }/* otp read out */ if (!i2c_check_functionality (client->adapter,I2C_FUNC_I2C ))
@@ -187,7 +189,7 @@ static int atmel_sha204a_probe(struct i2c_client *client) ret =sysfs_create_group (&client->dev.kobj, &atmel_sha204a_groups);if (ret) { -dev_err (&client->dev,"failed to register sysfs entry\n" ); +dev_err (&client->dev,"failed to create sysfs group (%d)\n" , ret);return ret; }
Signature · 1 line
2.53.0