Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'upstream-fixes' into upstream

Browse source
This commit is contained in:
John W. Linville 2006-08-23 14:22:14 -04:00
commit 4c2be501b7
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/net/wireless/hostap/hostap_hw.c
View file

@ -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;
}

2
drivers/net/wireless/spectrum_cs.c
View file

@ -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 */