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

Commit eb530b0f authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville
Browse files

b43: PHY: don't force default channel during init 



PHY may need to be re-initialized during runtime (e.g. on band switch).

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8c79e5ee

drivers/net/wireless/b43/phy_common.c

+3 −4
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ int b43_phy_init(struct b43_wldev *dev) 
	const struct b43_phy_operations *ops = phy->ops;

	int err;



	if (!phy->channel)

		phy->channel = ops->get_default_chan(dev);



	phy->ops->switch_analog(dev, true);
@@ -106,9 +107,7 @@ int b43_phy_init(struct b43_wldev *dev) 
	}

	phy->do_full_init = false;



	/* Make sure to switch hardware and firmware (SHM) to

	 * the default channel. */

	err = b43_switch_channel(dev, ops->get_default_chan(dev));

	err = b43_switch_channel(dev, phy->channel);

	if (err) {

		b43err(dev->wl, "PHY init: Channel switch to default failed\n");

		goto err_phy_exit;