ssb: PCI revision ID register is 8-bit wide
Sergei Shtylyov [Fri, 1 Jul 2011 18:35:28 +0000 (22:35 +0400)]
The SSB code reads PCI revision ID register as 16-bit entity while the register
is actually 8-bit only (the next 8 bits are the programming interface register).
Fix the read and make the 'rev' field of 'struct ssb_boardinfo' 8-bit as well,
to match the register size.

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

drivers/ssb/pci.c
include/linux/ssb/ssb.h

index 7ad4858..52b1ceb 100644 (file)
@@ -738,7 +738,7 @@ static void ssb_pci_get_boardinfo(struct ssb_bus *bus,
                             &bi->vendor);
        pci_read_config_word(bus->host_pci, PCI_SUBSYSTEM_ID,
                             &bi->type);
-       pci_read_config_word(bus->host_pci, PCI_REVISION_ID,
+       pci_read_config_byte(bus->host_pci, PCI_REVISION_ID,
                             &bi->rev);
 }
 
index 252e448..b0928c1 100644 (file)
@@ -99,7 +99,7 @@ struct ssb_sprom {
 struct ssb_boardinfo {
        u16 vendor;
        u16 type;
-       u16 rev;
+       u8  rev;
 };