Advertisement
trini

edma.patch

Oct 12th, 2012
104
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.82 KB | None | 0 0
  1. diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c
  2. index fd039db..355dc32 100644
  3. --- a/arch/arm/common/edma.c
  4. +++ b/arch/arm/common/edma.c
  5. @@ -1588,14 +1588,14 @@ static int __init edma_probe(struct platform_device *pdev)
  6. return -ENODEV;
  7.  
  8. for (j = 0; j < EDMA_MAX_CC; j++) {
  9. + if (!info[j]) {
  10. + if (found)
  11. + break;
  12. + else
  13. + return -ENODEV;
  14. + }
  15. if (node) {
  16. - int err;
  17. - err = of_address_to_resource(node, 0, &res[j]);
  18. - if (err) {
  19. - dev_err(dev,
  20. - "unable to find 'reg' property\n");
  21. - return -EIO;
  22. - }
  23. + of_address_to_resource(node, j, &res[j]);
  24. r[j] = &res[j];
  25.  
  26. } else {
  27. @@ -1604,7 +1604,7 @@ static int __init edma_probe(struct platform_device *pdev)
  28. IORESOURCE_MEM,
  29. res_name);
  30. }
  31. - if (!r[j] || !info[j]) {
  32. + if (!r[j]) {
  33. if (found)
  34. break;
  35. else
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement