Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c88761e authored by Tudor-Dan Ambarus's avatar Tudor-Dan Ambarus Committed by Herbert Xu
Browse files

crypto: atmel - return appropriate error code 



Return -ENODEV when dma_request_slave_channel_compat() fails.

Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent aba973c6

drivers/crypto/atmel-aes.c

+1 −2
Original line number Diff line number Diff line
@@ -2383,7 +2383,6 @@ static int atmel_aes_dma_init(struct atmel_aes_dev *dd, 
			      struct crypto_platform_data *pdata)

{

	struct at_dma_slave *slave;

	int err = -ENOMEM;

	dma_cap_mask_t 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);

err_dma_in:

	dev_warn(dd->dev, "no DMA channel available\n");

	return err;

	return -ENODEV;

}



static void atmel_aes_dma_cleanup(struct atmel_aes_dev *dd)

drivers/crypto/atmel-sha.c

+1 −2
Original line number Diff line number Diff line
@@ -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,

				struct crypto_platform_data *pdata)

{

	int err = -ENOMEM;

	dma_cap_mask_t mask_in;



	/* 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");

	if (!dd->dma_lch_in.chan) {

		dev_warn(dd->dev, "no DMA channel available\n");

		return err;

		return -ENODEV;

	}



	dd->dma_lch_in.dma_conf.direction = DMA_MEM_TO_DEV;

drivers/crypto/atmel-tdes.c

+1 −2
Original line number Diff line number Diff line
@@ -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,

			struct crypto_platform_data *pdata)

{

	int err = -ENOMEM;

	dma_cap_mask_t 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);

err_dma_in:

	dev_warn(dd->dev, "no DMA channel available\n");

	return err;

	return -ENODEV;

}



static void atmel_tdes_dma_cleanup(struct atmel_tdes_dev *dd)