diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2011-04-01 12:06:48 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-04-04 16:20:06 -0400 |
| commit | ce57d9e694d98e421e329fbac5d6f5dc5e9e101e (patch) | |
| tree | f22695ac2aa83c5d90d583f222e219ddf1d0f912 | |
| parent | 832fd35a545ecde11082d2dab74dd0aef8e0505e (diff) | |
| download | linux-stable-ce57d9e694d98e421e329fbac5d6f5dc5e9e101e.tar.gz linux-stable-ce57d9e694d98e421e329fbac5d6f5dc5e9e101e.tar.bz2 linux-stable-ce57d9e694d98e421e329fbac5d6f5dc5e9e101e.zip | |
ssb: trivial: use u8 for chip_rev (it's mask is 0xF)
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/ssb/scan.c | 2 | ||||
| -rw-r--r-- | include/linux/ssb/ssb.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ssb/scan.c b/drivers/ssb/scan.c index 29884c00c4d5..7dca719fbcfb 100644 --- a/drivers/ssb/scan.c +++ b/drivers/ssb/scan.c @@ -307,7 +307,7 @@ int ssb_bus_scan(struct ssb_bus *bus, } else { if (bus->bustype == SSB_BUSTYPE_PCI) { bus->chip_id = pcidev_to_chipid(bus->host_pci); - pci_read_config_word(bus->host_pci, PCI_REVISION_ID, + pci_read_config_byte(bus->host_pci, PCI_REVISION_ID, &bus->chip_rev); bus->chip_package = 0; } else { diff --git a/include/linux/ssb/ssb.h b/include/linux/ssb/ssb.h index 9659eff52ca2..7e99b348834c 100644 --- a/include/linux/ssb/ssb.h +++ b/include/linux/ssb/ssb.h @@ -308,7 +308,7 @@ struct ssb_bus { /* ID information about the Chip. */ u16 chip_id; - u16 chip_rev; + u8 chip_rev; u16 sprom_offset; u16 sprom_size; /* number of words in sprom */ u8 chip_package; |