redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

crypto: atmel-{sha,tdes} - Propagate error from _hw_version_init()

Browse source 
atmel_{sha,tdes}_hw_version_init() calls atmel_{sha,tdes}_hw_init(),
which may fail. Check the return code of atmel_{sha,tdes}_hw_init()
and propagate the error if needed.

Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Tudor Ambarus 2019-12-05 09:53:50 +00:00 committed by Herbert Xu
parent fb24307af2
commit 0efe58f3e9
2 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/crypto/atmel-sha.c
View file

@ -1038,9 +1038,13 @@ static inline unsigned int atmel_sha_get_version(struct atmel_sha_dev *dd)
return atmel_sha_read(dd, SHA_HW_VERSION) & 0x00000fff;
}
static void atmel_sha_hw_version_init(struct atmel_sha_dev *dd)
static int atmel_sha_hw_version_init(struct atmel_sha_dev *dd)
{
atmel_sha_hw_init(dd);
int err;
err = atmel_sha_hw_init(dd);
if (err)
return err;
dd->hw_version = atmel_sha_get_version(dd);
@ -1048,6 +1052,8 @@ static void atmel_sha_hw_version_init(struct atmel_sha_dev *dd)
"version: 0x%x\n", dd->hw_version);
clk_disable(dd->iclk);
return 0;
}
static int atmel_sha_handle_queue(struct atmel_sha_dev *dd,
@ -2789,7 +2795,9 @@ static int atmel_sha_probe(struct platform_device *pdev)
if (err)
goto res_err;
atmel_sha_hw_version_init(sha_dd);
err = atmel_sha_hw_version_init(sha_dd);
if (err)
goto iclk_unprepare;
atmel_sha_get_cap(sha_dd);

14
drivers/crypto/atmel-tdes.c
View file

@ -236,9 +236,13 @@ static inline unsigned int atmel_tdes_get_version(struct atmel_tdes_dev *dd)
return atmel_tdes_read(dd, TDES_HW_VERSION) & 0x00000fff;
}
static void atmel_tdes_hw_version_init(struct atmel_tdes_dev *dd)
static int atmel_tdes_hw_version_init(struct atmel_tdes_dev *dd)
{
atmel_tdes_hw_init(dd);
int err;
err = atmel_tdes_hw_init(dd);
if (err)
return err;
dd->hw_version = atmel_tdes_get_version(dd);
@ -246,6 +250,8 @@ static void atmel_tdes_hw_version_init(struct atmel_tdes_dev *dd)
"version: 0x%x\n", dd->hw_version);
clk_disable_unprepare(dd->iclk);
return 0;
}
static void atmel_tdes_dma_callback(void *data)
@ -1291,7 +1297,9 @@ static int atmel_tdes_probe(struct platform_device *pdev)
goto res_err;
}
atmel_tdes_hw_version_init(tdes_dd);
err = atmel_tdes_hw_version_init(tdes_dd);
if (err)
goto res_err;
atmel_tdes_get_cap(tdes_dd);