diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-04-21 14:43:36 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-04-21 14:43:36 +0800 |
| commit | 9beee7af111a7afa5f7b787daaf8a6891c05f216 (patch) | |
| tree | 92fdbea807b9ef2917d1f087355f08617230dd75 /drivers/crypto/atmel-sha.c | |
| parent | e8490c42825967752fef08dddf37eb3f5f34d753 (diff) | |
| parent | fd9302c16fc244139c1ddfdffc145d5b772ed9ce (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-androidlsk-v4.1-16.04-android
Conflicts:
keep -fno-pic flag in arch/arm64/Makefile
Diffstat (limited to 'drivers/crypto/atmel-sha.c')
| -rw-r--r-- | drivers/crypto/atmel-sha.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/crypto/atmel-sha.c b/drivers/crypto/atmel-sha.c index a71c97c03c39..3178f84d2757 100644 --- a/drivers/crypto/atmel-sha.c +++ b/drivers/crypto/atmel-sha.c @@ -1492,13 +1492,6 @@ static int atmel_sha_remove(struct platform_device *pdev) clk_unprepare(sha_dd->iclk); - iounmap(sha_dd->io_base); - - clk_put(sha_dd->iclk); - - if (sha_dd->irq >= 0) - free_irq(sha_dd->irq, sha_dd); - return 0; } |