Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 199654
b: refs/heads/master
c: 7cea8cc
h: refs/heads/master
v: v3
  • Loading branch information
Anatolij Gustschin authored and Grant Likely committed Jun 3, 2010
1 parent 6fea4a5 commit 4605171
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 05c02542c20aa00dc9a66f4bfb1a89d1131457f2
refs/heads/master: 7cea8cc4705d25d9c7baee06efd665db27481242
6 changes: 3 additions & 3 deletions trunk/drivers/crypto/amcc/crypto4xx_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1158,7 +1158,7 @@ static int __init crypto4xx_probe(struct of_device *ofdev,
struct device *dev = &ofdev->dev;
struct crypto4xx_core_device *core_dev;

rc = of_address_to_resource(ofdev->node, 0, &res);
rc = of_address_to_resource(ofdev->dev.of_node, 0, &res);
if (rc)
return -ENODEV;

Expand Down Expand Up @@ -1215,13 +1215,13 @@ static int __init crypto4xx_probe(struct of_device *ofdev,
(unsigned long) dev);

/* Register for Crypto isr, Crypto Engine IRQ */
core_dev->irq = irq_of_parse_and_map(ofdev->node, 0);
core_dev->irq = irq_of_parse_and_map(ofdev->dev.of_node, 0);
rc = request_irq(core_dev->irq, crypto4xx_ce_interrupt_handler, 0,
core_dev->dev->name, dev);
if (rc)
goto err_request_irq;

core_dev->dev->ce_base = of_iomap(ofdev->node, 0);
core_dev->dev->ce_base = of_iomap(ofdev->dev.of_node, 0);
if (!core_dev->dev->ce_base) {
dev_err(dev, "failed to of_iomap\n");
goto err_iomap;
Expand Down

0 comments on commit 4605171

Please sign in to comment.