Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d72b5d3 authored by Tristram Ha's avatar Tristram Ha Committed by Greg Kroah-Hartman
Browse files

net: dsa: microchip: initialize mutex before use 



[ Upstream commit 284fb78ed7572117846f8e1d1d8e3dbfd16880c2 ]

Initialize mutex before use.  Avoid kernel complaint when
CONFIG_DEBUG_LOCK_ALLOC is enabled.

Fixes: b987e98e ("dsa: add DSA switch driver for Microchip KSZ9477")
Signed-off-by: default avatarTristram Ha <Tristram.Ha@microchip.com>
Reviewed-by: default avatarPavel Machek <pavel@ucw.cz>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ab60e82f

drivers/net/dsa/microchip/ksz_common.c

+5 −5
Original line number Diff line number Diff line
@@ -1117,11 +1117,6 @@ static int ksz_switch_init(struct ksz_device *dev) 
{

	int i;



	mutex_init(&dev->reg_mutex);

	mutex_init(&dev->stats_mutex);

	mutex_init(&dev->alu_mutex);

	mutex_init(&dev->vlan_mutex);



	dev->ds->ops = &ksz_switch_ops;



	for (i = 0; i < ARRAY_SIZE(ksz_switch_chips); i++) {
@@ -1206,6 +1201,11 @@ int ksz_switch_register(struct ksz_device *dev) 
	if (dev->pdata)

		dev->chip_id = dev->pdata->chip_id;



	mutex_init(&dev->reg_mutex);

	mutex_init(&dev->stats_mutex);

	mutex_init(&dev->alu_mutex);

	mutex_init(&dev->vlan_mutex);



	if (ksz_switch_detect(dev))

		return -EINVAL;