diff options
| author | Darren Stevens <darren@stevens-zone.net> | 2017-12-31 20:53:55 +0000 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2018-08-20 11:01:13 +0200 |
| commit | 5c18d12ced225fa0ad5a03fb42bbb293815d1342 (patch) | |
| tree | 75f921efdbc3f6c525c5d8deeb2e0e9282b45727 /drivers/i2c/busses | |
| parent | 15c566fcff9cc7b8fd64461d6ee6fd1bc665b444 (diff) | |
| download | linux-5c18d12ced225fa0ad5a03fb42bbb293815d1342.tar.gz linux-5c18d12ced225fa0ad5a03fb42bbb293815d1342.tar.bz2 linux-5c18d12ced225fa0ad5a03fb42bbb293815d1342.zip | |
i2c: pasemi: remove hardcoded bus numbers on smbus
The pasemi smbus controller uses PCI_FUNC(dev->devfn) to define which
number bus to attach to, however this fails when something else is
probed first, for example an ATI Radeon graphics card will claim 9 or
10 busses, including the ones the pasemi wants.
Patch the driver to call i2c_add_adapter rather than
i2c_add_numbered_adapter.
Signed-off-by: Darren Stevens <darren@stevens-zone.net>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c/busses')
| -rw-r--r-- | drivers/i2c/busses/i2c-pasemi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-pasemi.c b/drivers/i2c/busses/i2c-pasemi.c index 55fd5c6f3cca..50803e5d995b 100644 --- a/drivers/i2c/busses/i2c-pasemi.c +++ b/drivers/i2c/busses/i2c-pasemi.c @@ -365,7 +365,6 @@ static int pasemi_smb_probe(struct pci_dev *dev, smbus->adapter.class = I2C_CLASS_HWMON | I2C_CLASS_SPD; smbus->adapter.algo = &smbus_algorithm; smbus->adapter.algo_data = smbus; - smbus->adapter.nr = PCI_FUNC(dev->devfn); /* set up the sysfs linkage to our parent device */ smbus->adapter.dev.parent = &dev->dev; @@ -373,7 +372,7 @@ static int pasemi_smb_probe(struct pci_dev *dev, reg_write(smbus, REG_CTL, (CTL_MTR | CTL_MRR | (CLK_100K_DIV & CTL_CLK_M))); - error = i2c_add_numbered_adapter(&smbus->adapter); + error = i2c_add_adapter(&smbus->adapter); if (error) goto out_release_region; |