Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 199711
b: refs/heads/master
c: 0f0a8fa
h: refs/heads/master
i:
  199709: 2860e31
  199707: ea7fe46
  199703: 28c294c
  199695: fe14a6c
  199679: 813dfd2
v: v3
  • Loading branch information
Anatolij Gustschin authored and Herbert Xu committed Jun 3, 2010
1 parent 4327526 commit b798980
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: c9aa55e5271a53d28e93fa58759d318b403c15ba
refs/heads/master: 0f0a8fa735bbde4b0bc3e96e4bb2e5b380a324db
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 b798980

Please sign in to comment.