Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6

1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c
index 904b1a8d0885..57c4ccfab1ee 100644
--- a/drivers/ssb/pci.c
+++ b/drivers/ssb/pci.c
@@ -484,6 +484,11 @@ static int sprom_extract(struct ssb_bus *bus, struct ssb_sprom *out,
                         goto unsupported;
         }
 
+        if (out->boardflags_lo == 0xFFFF)
+                out->boardflags_lo = 0;  /* per specs */
+        if (out->boardflags_hi == 0xFFFF)
+                out->boardflags_hi = 0;  /* per specs */
+
         return 0;
 unsupported:
         ssb_printk(KERN_WARNING PFX "Unsupported SPROM revision %d "