| Message ID | 201107012235.28745.sshtylyov@ru.mvista.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
On Fri, Jul 01, 2011 at 10:35:28PM +0400, Sergei Shtylyov wrote: > 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> Applied.
Index: linux-2.6/drivers/ssb/pci.c =================================================================== --- linux-2.6.orig/drivers/ssb/pci.c +++ linux-2.6/drivers/ssb/pci.c @@ -738,7 +738,7 @@ static void ssb_pci_get_boardinfo(struct &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: linux-2.6/include/linux/ssb/ssb.h =================================================================== --- linux-2.6.orig/include/linux/ssb/ssb.h +++ linux-2.6/include/linux/ssb/ssb.h @@ -99,7 +99,7 @@ struct ssb_sprom { struct ssb_boardinfo { u16 vendor; u16 type; - u16 rev; + u8 rev; };
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> --- The patch is against the recent Linus' tree. Resending with proper tearline this time... drivers/ssb/pci.c | 2 +- include/linux/ssb/ssb.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html