diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-10-17 20:02:07 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-10-17 20:02:07 +0200 |
| commit | 9f96da4dd2ccf685b506a21104cb13b1aadd907a (patch) | |
| tree | 5d9eff61123f096e2434a9d36e6fdbd4cc5c6292 /drivers/net/wireless/rt2x00/rt2x00pci.c | |
| parent | tcp: tcp_transmit_skb() optimizations (diff) | |
| parent | rt2x00: rt2800lib: remove duplicate rf_vals for RF3053 (diff) | |
| download | linux-9f96da4dd2ccf685b506a21104cb13b1aadd907a.tar.xz linux-9f96da4dd2ccf685b506a21104cb13b1aadd907a.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00pci.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c index dc49e525ae5e..25da20e7e1f3 100644 --- a/drivers/net/wireless/rt2x00/rt2x00pci.c +++ b/drivers/net/wireless/rt2x00/rt2x00pci.c @@ -119,7 +119,7 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct rt2x00_ops *ops) rt2x00dev->ops = ops; rt2x00dev->hw = hw; rt2x00dev->irq = pci_dev->irq; - rt2x00dev->name = pci_name(pci_dev); + rt2x00dev->name = ops->name; if (pci_is_pcie(pci_dev)) rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_PCIE); |