From 904842b3fe4f182bd1ba37cea23c77a169032318 Mon Sep 17 00:00:00 2001 From: "Larry.Finger@lwfinger.net" Date: Sat, 19 Apr 2008 16:24:09 +0200 Subject: [PATCH] --- yaml --- r: 102446 b: refs/heads/master c: 2afc49015db927fea7bc6ca33c0a60bf5d7c2c5f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ssb/pci.c | 20 +++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 0c2c4762cf0b..91c69b800878 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3acea5b616c6d85008700a9d51cb02a81b2d0c67 +refs/heads/master: 2afc49015db927fea7bc6ca33c0a60bf5d7c2c5f diff --git a/trunk/drivers/ssb/pci.c b/trunk/drivers/ssb/pci.c index 57c4ccfab1ee..f883dcfffe06 100644 --- a/trunk/drivers/ssb/pci.c +++ b/trunk/drivers/ssb/pci.c @@ -510,17 +510,15 @@ static int ssb_pci_sprom_get(struct ssb_bus *bus, sprom_do_read(bus, buf); err = sprom_check_crc(buf, bus->sprom_size); if (err) { - /* check for rev 4 sprom - has special signature */ - if (buf[32] == 0x5372) { - kfree(buf); - buf = kcalloc(SSB_SPROMSIZE_WORDS_R4, sizeof(u16), - GFP_KERNEL); - if (!buf) - goto out; - bus->sprom_size = SSB_SPROMSIZE_WORDS_R4; - sprom_do_read(bus, buf); - err = sprom_check_crc(buf, bus->sprom_size); - } + /* try for a 440 byte SPROM - revision 4 and higher */ + kfree(buf); + buf = kcalloc(SSB_SPROMSIZE_WORDS_R4, sizeof(u16), + GFP_KERNEL); + if (!buf) + goto out; + bus->sprom_size = SSB_SPROMSIZE_WORDS_R4; + sprom_do_read(bus, buf); + err = sprom_check_crc(buf, bus->sprom_size); if (err) ssb_printk(KERN_WARNING PFX "WARNING: Invalid" " SPROM CRC (corrupt SPROM)\n");