A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 03:01:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

Browse source 
Conflicts:
	drivers/bluetooth/ath3k.c
	drivers/bluetooth/btusb.c
This commit is contained in:
John W. Linville 2011-02-18 17:03:41 -05:00
commit b67afe7f43
21 changed files with 51 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/ssb/pcmcia.c
View file

@ -733,7 +733,7 @@ int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
/* Fetch the vendor specific tuples. */
res = pcmcia_loop_tuple(bus->host_pcmcia, SSB_PCMCIA_CIS,
ssb_pcmcia_do_get_invariants, sprom);
ssb_pcmcia_do_get_invariants, iv);
if ((res == 0) || (res == -ENOSPC))
return 0;