mirror of
https://github.com/torvalds/linux.git
synced 2026-09-29 04:22:03 +02:00
crypto: atmel-sha204a - fail on hwrng registration error in probe path
Commit13909a0c88("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. Fixes:13909a0c88("crypto: atmel-sha204a - provide the otp content") Cc: stable@vger.kernel.org Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
parent
d58b4a09d7
commit
49e05bb00f
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user