diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-06-30 19:34:06 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-06-30 19:34:06 +0200 |
| commit | df2cbe40753dc36af294c30209ed909869aca6cf (patch) | |
| tree | 39eb7e8e06737b295007126f4e16c1b688427163 /drivers/ssb/scan.c | |
| parent | myri10ge: Update MAINTAINERS (diff) | |
| parent | rtlwifi: potential forever loop in rtl92de_hw_init() (diff) | |
| download | linux-df2cbe40753dc36af294c30209ed909869aca6cf.tar.xz linux-df2cbe40753dc36af294c30209ed909869aca6cf.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/ssb/scan.c')
| -rw-r--r-- | drivers/ssb/scan.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ssb/scan.c b/drivers/ssb/scan.c index 45e5babd3961..8047f9aaa4b2 100644 --- a/drivers/ssb/scan.c +++ b/drivers/ssb/scan.c @@ -310,8 +310,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_byte(bus->host_pci, PCI_REVISION_ID, - &bus->chip_rev); + bus->chip_rev = bus->host_pci->revision; bus->chip_package = 0; } else { bus->chip_id = 0x4710; |