mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 12:10:52 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two minor conflicts in virtio_net driver (bug fix overlapping addition of a helper) and MAINTAINERS (new driver edit overlapping revamp of PHY entry). Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
commit
29fda25a2d
537 changed files with 11723 additions and 5156 deletions
|
|
@ -476,7 +476,7 @@ int of_irq_to_resource_table(struct device_node *dev, struct resource *res,
|
|||
int i;
|
||||
|
||||
for (i = 0; i < nr_irqs; i++, res++)
|
||||
if (!of_irq_to_resource(dev, i, res))
|
||||
if (of_irq_to_resource(dev, i, res) <= 0)
|
||||
break;
|
||||
|
||||
return i;
|
||||
|
|
|
|||
Loading…
Reference in a new issue