ssb: PCI revision ID register is 8-bit wide

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 <[email protected]>
Signed-off-by: John W. Linville <[email protected]>

diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c
index 7ad48585c5e6c0cc0ad9c0593ae3ad24394b0314..52b1ceb748c75bbefeab539e24744a8e2bd5715f 100644 (file)
--- a/drivers/ssb/pci.c
+++ b/drivers/ssb/pci.c
@@ -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);
 }
 

diff --git a/include/linux/ssb/ssb.h b/include/linux/ssb/ssb.h
index 252e448217874ec0e8b47ce4ec2af2d844c45354..b0928c10111b547e5e323bf1b2f2a5952a430c94 100644 (file)
--- a/include/linux/ssb/ssb.h
+++ b/include/linux/ssb/ssb.h
@@ -99,7 +99,7 @@ struct ssb_sprom {
 struct ssb_boardinfo {
        u16 vendor;
        u16 type;
-       u16 rev;
+       u8  rev;
 };