projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[linux-drm-fsl-dcu.git]
/
drivers
/
crypto
/
omap-sham.c
diff --git
a/drivers/crypto/omap-sham.c
b/drivers/crypto/omap-sham.c
index 236db0a44105257974d0dc73e38b93d1f3380b6b..e45aaaf0db3069d5c99cef88664dfdc62a87d434 100644
(file)
--- a/
drivers/crypto/omap-sham.c
+++ b/
drivers/crypto/omap-sham.c
@@
-1818,7
+1818,7
@@
static int omap_sham_get_res_of(struct omap_sham_dev *dd,
goto err;
}
- dd->irq =
of_irq_to_resource(node, 0, NULL
);
+ dd->irq =
irq_of_parse_and_map(node, 0
);
if (!dd->irq) {
dev_err(dev, "can't translate OF irq value\n");
err = -EINVAL;