diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2013-08-09 13:00:39 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2013-08-09 13:00:39 +0930 |
| commit | 11489736177c5930514482b4db7af862d945335d (patch) | |
| tree | 8590ec4ba037b79c94982e15922fe50a1f0193a3 /arch/mips/cavium-octeon/octeon-platform.c | |
| parent | 3f0d0c9b47e09d47fcb755fed786a1ee88e110b5 (diff) | |
| parent | 6c2580c501c660fdfb506061e016d84570fceba1 (diff) | |
Merge branch 'master' into virtio-next
The next commit gets conflicts because it relies on patches which were
cc:stable and thus had to be merged into Linus' tree before the coming
merge window. So pull in master now.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'arch/mips/cavium-octeon/octeon-platform.c')
| -rw-r--r-- | arch/mips/cavium-octeon/octeon-platform.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/cavium-octeon/octeon-platform.c b/arch/mips/cavium-octeon/octeon-platform.c index 7b746e7bf7a..1830874ff1e 100644 --- a/arch/mips/cavium-octeon/octeon-platform.c +++ b/arch/mips/cavium-octeon/octeon-platform.c @@ -334,9 +334,10 @@ static void __init octeon_fdt_pip_iface(int pip, int idx, u64 *pmac) char name_buffer[20]; int iface; int p; - int count; + int count = 0; - count = cvmx_helper_interface_enumerate(idx); + if (cvmx_helper_interface_enumerate(idx) == 0) + count = cvmx_helper_ports_on_interface(idx); snprintf(name_buffer, sizeof(name_buffer), "interface@%d", idx); iface = fdt_subnode_offset(initial_boot_params, pip, name_buffer); |