projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...
[cascardo/linux.git]
/
drivers
/
crypto
/
atmel-tdes.c
diff --git
a/drivers/crypto/atmel-tdes.c
b/drivers/crypto/atmel-tdes.c
index
2c7a628
..
bf467d7
100644
(file)
--- a/
drivers/crypto/atmel-tdes.c
+++ b/
drivers/crypto/atmel-tdes.c
@@
-1417,9
+1417,9
@@
static int atmel_tdes_probe(struct platform_device *pdev)
}
tdes_dd->io_base = devm_ioremap_resource(&pdev->dev, tdes_res);
- if (
!tdes_dd->io_base
) {
+ if (
IS_ERR(tdes_dd->io_base)
) {
dev_err(dev, "can't ioremap\n");
- err =
-ENOMEM
;
+ err =
PTR_ERR(tdes_dd->io_base)
;
goto res_err;
}