From 478ec5d209def3397c2ac1a7cae4a24a2921fe47 Mon Sep 17 00:00:00 2001 From: Sergei Shtylyov Date: Fri, 1 Jul 2011 22:35:28 +0400 Subject: [PATCH] --- yaml --- r: 256194 b: refs/heads/master c: 304e21bbeab0d208dc7e6142fb75db8a466d5217 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ssb/pci.c | 2 +- trunk/include/linux/ssb/ssb.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 152568b0c7e4..5a99fd3335d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 45a771385ceb644941b195f37ab98f7db39776bd +refs/heads/master: 304e21bbeab0d208dc7e6142fb75db8a466d5217 diff --git a/trunk/drivers/ssb/pci.c b/trunk/drivers/ssb/pci.c index 7ad48585c5e6..52b1ceb748c7 100644 --- a/trunk/drivers/ssb/pci.c +++ b/trunk/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/trunk/include/linux/ssb/ssb.h b/trunk/include/linux/ssb/ssb.h index 252e44821787..b0928c10111b 100644 --- a/trunk/include/linux/ssb/ssb.h +++ b/trunk/include/linux/ssb/ssb.h @@ -99,7 +99,7 @@ struct ssb_sprom { struct ssb_boardinfo { u16 vendor; u16 type; - u16 rev; + u8 rev; };