diff options
| author | Rob Herring | 2013-11-07 17:34:46 +0100 |
|---|---|---|
| committer | Rob Herring | 2013-11-07 17:34:46 +0100 |
| commit | b5480950c6cbb7b07ab1c1a5af0dc661a1cb6f24 (patch) | |
| tree | b5fcb00387a838beb2bcf2f8ed2fd3d6d460c8ae /drivers/crypto/caam/jr.c | |
| parent | MIPS: Netlogic: replace early_init_devtree() call (diff) | |
| parent | of/irq: Fix potential buffer overflow (diff) | |
| download | kernel-qcow2-linux-b5480950c6cbb7b07ab1c1a5af0dc661a1cb6f24.tar.gz kernel-qcow2-linux-b5480950c6cbb7b07ab1c1a5af0dc661a1cb6f24.tar.xz kernel-qcow2-linux-b5480950c6cbb7b07ab1c1a5af0dc661a1cb6f24.zip | |
Merge remote-tracking branch 'grant/devicetree/next' into for-next
Diffstat (limited to 'drivers/crypto/caam/jr.c')
| -rw-r--r-- | drivers/crypto/caam/jr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/crypto/caam/jr.c b/drivers/crypto/caam/jr.c index 94b80a937647..bdb786d5a5e5 100644 --- a/drivers/crypto/caam/jr.c +++ b/drivers/crypto/caam/jr.c @@ -405,7 +405,7 @@ int caam_jr_probe(struct platform_device *pdev, struct device_node *np, dma_set_mask(jrdev, DMA_BIT_MASK(32)); /* Identify the interrupt */ - jrpriv->irq = of_irq_to_resource(np, 0, NULL); + jrpriv->irq = irq_of_parse_and_map(np, 0); /* Now do the platform independent part */ error = caam_jr_init(jrdev); /* now turn on hardware */ |