android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crypto: atmel - return appropriate error code

Browse Source 
Return -ENODEV when dma_request_slave_channel_compat() fails.

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-Dan Ambarus 2017-10-23 18:34:39 +03:00 committed by Herbert Xu
parent aba973c69e
commit 3c88761e8a
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/crypto/atmel-aes.c
View File

@ -2383,7 +2383,6 @@ static int atmel_aes_dma_init(struct atmel_aes_dev *dd,
struct crypto_platform_data *pdata) struct crypto_platform_data *pdata)
{ {
struct at_dma_slave *slave; struct at_dma_slave *slave;
int err = -ENOMEM;
dma_cap_mask_t mask; dma_cap_mask_t mask;
dma_cap_zero(mask); dma_cap_zero(mask);
@ -2408,7 +2407,7 @@ static int atmel_aes_dma_init(struct atmel_aes_dev *dd,
dma_release_channel(dd->src.chan); dma_release_channel(dd->src.chan);
err_dma_in: err_dma_in:
dev_warn(dd->dev, "no DMA channel available\n"); dev_warn(dd->dev, "no DMA channel available\n");
return err; return -ENODEV;
} }
static void atmel_aes_dma_cleanup(struct atmel_aes_dev *dd) static void atmel_aes_dma_cleanup(struct atmel_aes_dev *dd)

3
drivers/crypto/atmel-sha.c
View File

@ -2628,7 +2628,6 @@ static bool atmel_sha_filter(struct dma_chan *chan, void *slave)
static int atmel_sha_dma_init(struct atmel_sha_dev *dd, static int atmel_sha_dma_init(struct atmel_sha_dev *dd,
struct crypto_platform_data *pdata) struct crypto_platform_data *pdata)
{ {
int err = -ENOMEM;
dma_cap_mask_t mask_in; dma_cap_mask_t mask_in;
/* Try to grab DMA channel */ /* Try to grab DMA channel */
@ -2639,7 +2638,7 @@ static int atmel_sha_dma_init(struct atmel_sha_dev *dd,
atmel_sha_filter, &pdata->dma_slave->rxdata, dd->dev, "tx"); atmel_sha_filter, &pdata->dma_slave->rxdata, dd->dev, "tx");
if (!dd->dma_lch_in.chan) { if (!dd->dma_lch_in.chan) {
dev_warn(dd->dev, "no DMA channel available\n"); dev_warn(dd->dev, "no DMA channel available\n");
return err; return -ENODEV;
} }
dd->dma_lch_in.dma_conf.direction = DMA_MEM_TO_DEV; dd->dma_lch_in.dma_conf.direction = DMA_MEM_TO_DEV;

3
drivers/crypto/atmel-tdes.c
View File

@ -720,7 +720,6 @@ static bool atmel_tdes_filter(struct dma_chan *chan, void *slave)
static int atmel_tdes_dma_init(struct atmel_tdes_dev *dd, static int atmel_tdes_dma_init(struct atmel_tdes_dev *dd,
struct crypto_platform_data *pdata) struct crypto_platform_data *pdata)
{ {
int err = -ENOMEM;
dma_cap_mask_t mask; dma_cap_mask_t mask;
dma_cap_zero(mask); dma_cap_zero(mask);
@ -765,7 +764,7 @@ static int atmel_tdes_dma_init(struct atmel_tdes_dev *dd,
dma_release_channel(dd->dma_lch_in.chan); dma_release_channel(dd->dma_lch_in.chan);
err_dma_in: err_dma_in:
dev_warn(dd->dev, "no DMA channel available\n"); dev_warn(dd->dev, "no DMA channel available\n");
return err; return -ENODEV;
} }
static void atmel_tdes_dma_cleanup(struct atmel_tdes_dev *dd) static void atmel_tdes_dma_cleanup(struct atmel_tdes_dev *dd)