Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2 files changed, 7 insertions, 7 deletions

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 47e1c24073b5..96728d1e9824 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -4247,7 +4247,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
                 .name = "Marvell 88E6190",
                 .num_databases = 4096,
                 .num_ports = 11,        /* 10 + Z80 */
-                .num_internal_phys = 11,
+                .num_internal_phys = 9,
                 .num_gpio = 16,
                 .max_vid = 8191,
                 .port_base_addr = 0x0,
@@ -4270,7 +4270,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
                 .name = "Marvell 88E6190X",
                 .num_databases = 4096,
                 .num_ports = 11,        /* 10 + Z80 */
-                .num_internal_phys = 11,
+                .num_internal_phys = 9,
                 .num_gpio = 16,
                 .max_vid = 8191,
                 .port_base_addr = 0x0,
@@ -4293,7 +4293,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
                 .name = "Marvell 88E6191",
                 .num_databases = 4096,
                 .num_ports = 11,        /* 10 + Z80 */
-                .num_internal_phys = 11,
+                .num_internal_phys = 9,
                 .max_vid = 8191,
                 .port_base_addr = 0x0,
                 .phy_base_addr = 0x0,
@@ -4340,7 +4340,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
                 .name = "Marvell 88E6290",
                 .num_databases = 4096,
                 .num_ports = 11,        /* 10 + Z80 */
-                .num_internal_phys = 11,
+                .num_internal_phys = 9,
                 .num_gpio = 16,
                 .max_vid = 8191,
                 .port_base_addr = 0x0,
@@ -4502,7 +4502,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
                 .name = "Marvell 88E6390",
                 .num_databases = 4096,
                 .num_ports = 11,        /* 10 + Z80 */
-                .num_internal_phys = 11,
+                .num_internal_phys = 9,
                 .num_gpio = 16,
                 .max_vid = 8191,
                 .port_base_addr = 0x0,
@@ -4525,7 +4525,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
                 .name = "Marvell 88E6390X",
                 .num_databases = 4096,
                 .num_ports = 11,        /* 10 + Z80 */
-                .num_internal_phys = 11,
+                .num_internal_phys = 9,
                 .num_gpio = 16,
                 .max_vid = 8191,
                 .port_base_addr = 0x0,
diff --git a/drivers/net/dsa/mv88e6xxx/port.c b/drivers/net/dsa/mv88e6xxx/port.c
index 9f6ac116c214..0796c6feec55 100644
--- a/drivers/net/dsa/mv88e6xxx/port.c
+++ b/drivers/net/dsa/mv88e6xxx/port.c
@@ -190,7 +190,7 @@ int mv88e6xxx_port_set_duplex(struct mv88e6xxx_chip *chip, int port, int dup)
                 /* normal duplex detection */
                 break;
         default:
-                return -EINVAL;
+                return -EOPNOTSUPP;
         }
 
         err = mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_MAC_CTL, reg);