summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2009-09-13 15:55:13 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-09-23 11:35:41 -0400
commitd45b90ddee58db8caa3b06c3709b73dd0444559c (patch)
treeda14d2de642dbae0d4085dbd0166f2b329ecbc46
parent96d8c6af24bcacb16f18fc88fb7f2de1a59c09d6 (diff)
downloadlinux-d45b90ddee58db8caa3b06c3709b73dd0444559c.tar.gz
linux-d45b90ddee58db8caa3b06c3709b73dd0444559c.tar.bz2
linux-d45b90ddee58db8caa3b06c3709b73dd0444559c.zip
ssb: Fix error when V1 SPROM extraction is forced
When an SPROM revision is not recognized, the code falls back to a V1 SPROM; however, that revision is not forced in the appropriate structure. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/ssb/pci.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c
index f853d5600ca7..9e50896233aa 100644
--- a/drivers/ssb/pci.c
+++ b/drivers/ssb/pci.c
@@ -600,6 +600,7 @@ static int sprom_extract(struct ssb_bus *bus, struct ssb_sprom *out,
ssb_printk(KERN_WARNING PFX "Unsupported SPROM"
" revision %d detected. Will extract"
" v1\n", out->revision);
+ out->revision = 1;
sprom_extract_r123(out, in);
}
}