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

Commit 4c2be501 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'upstream-fixes' into upstream

parents 69758820 9b5cce07

drivers/net/wireless/hostap/hostap_hw.c

+3 −0
Original line number Diff line number Diff line
@@ -1042,6 +1042,9 @@ static int prism2_reset_port(struct net_device *dev) 
		       dev->name, local->fragm_threshold);

	}



	/* Some firmwares lose antenna selection settings on reset */

	(void) hostap_set_antsel(local);



	return res;

}

drivers/net/wireless/spectrum_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ spectrum_reset(struct pcmcia_device *link, int idle) 
	u_int save_cor;



	/* Doing it if hardware is gone is guaranteed crash */

	if (pcmcia_dev_present(link))

	if (!pcmcia_dev_present(link))

		return -ENODEV;



	/* Save original COR value */