diff options
| author | David S. Miller <davem@davemloft.net> | 2018-03-20 12:29:58 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-03-20 12:29:58 -0400 |
| commit | 0466080c751ec2de9efae3ac6305225cc4326047 (patch) | |
| tree | e5d6bea9416c29870a31f89e65099c9e30b0233c | |
| parent | 6349a169623159a011d3a3eaea39b4e2f751888e (diff) | |
| parent | 36d6ea94b07120bfa3c7db7772175037d9799d5a (diff) | |
Merge branch 'dsa-mv88e6xxx-some-fixes'
Uwe Kleine-König says:
====================
net: dsa: mv88e6xxx: some fixes
these patches target net-next and got approved by Andrew Lunn.
Compared to (implicit) v1, I dropped the patch that I didn't know if it
was right because of missing documentation on my side. But Andrew
already cared for that in a patch that is now adfccf118211 in net-next.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/dsa/mv88e6xxx/chip.c | 4 | ||||
| -rw-r--r-- | drivers/net/dsa/mv88e6xxx/global2.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index fe46b40195fa..fd78378ad6b1 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -3427,7 +3427,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { [MV88E6141] = { .prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6141, .family = MV88E6XXX_FAMILY_6341, - .name = "Marvell 88E6341", + .name = "Marvell 88E6141", .num_databases = 4096, .num_ports = 6, .num_internal_phys = 5, @@ -4175,7 +4175,7 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev) } /* Has to be performed before the MDIO bus is created, because - * the PHYs will link there interrupts to these interrupt + * the PHYs will link their interrupts to these interrupt * controllers */ mutex_lock(&chip->reg_lock); diff --git a/drivers/net/dsa/mv88e6xxx/global2.c b/drivers/net/dsa/mv88e6xxx/global2.c index 6c620974fef3..0ce627fded48 100644 --- a/drivers/net/dsa/mv88e6xxx/global2.c +++ b/drivers/net/dsa/mv88e6xxx/global2.c @@ -1090,7 +1090,7 @@ int mv88e6xxx_g2_irq_setup(struct mv88e6xxx_chip *chip) err = request_threaded_irq(chip->device_irq, NULL, mv88e6xxx_g2_irq_thread_fn, - IRQF_ONESHOT, "mv88e6xxx-g1", chip); + IRQF_ONESHOT, "mv88e6xxx-g2", chip); if (err) goto out; |