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

Commit 6c4f1994 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by David S. Miller
Browse files

gianfar: Do not call device_set_wakeup_enable() under a spinlock 



The gianfar driver calls device_set_wakeup_enable() under a spinlock,
which causes a problem to happen after the recent core power
management changes, because this function can sleep now.  Fix this
by moving the device_set_wakeup_enable() call out of the
spinlock-protected area.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 40385653

drivers/net/gianfar_ethtool.c

+3 −2
Original line number Diff line number Diff line
@@ -635,9 +635,10 @@ static int gfar_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) 
	if (wol->wolopts & ~WAKE_MAGIC)

		return -EINVAL;



	device_set_wakeup_enable(&dev->dev, wol->wolopts & WAKE_MAGIC);



	spin_lock_irqsave(&priv->bflock, flags);

	priv->wol_en = wol->wolopts & WAKE_MAGIC ? 1 : 0;

	device_set_wakeup_enable(&dev->dev, priv->wol_en);

	priv->wol_en =  !!device_may_wakeup(&dev->dev);

	spin_unlock_irqrestore(&priv->bflock, flags);



	return 0;