diff options
Diffstat (limited to 'drivers/i2c/busses/i2c-ali15x3.c')
-rw-r--r-- | drivers/i2c/busses/i2c-ali15x3.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c index e13d60c120b..7a5c0941dbc 100644 --- a/drivers/i2c/busses/i2c-ali15x3.c +++ b/drivers/i2c/busses/i2c-ali15x3.c | |||
@@ -130,6 +130,7 @@ module_param(force_addr, ushort, 0); | |||
130 | MODULE_PARM_DESC(force_addr, | 130 | MODULE_PARM_DESC(force_addr, |
131 | "Initialize the base address of the i2c controller"); | 131 | "Initialize the base address of the i2c controller"); |
132 | 132 | ||
133 | static struct pci_driver ali15x3_driver; | ||
133 | static unsigned short ali15x3_smba; | 134 | static unsigned short ali15x3_smba; |
134 | 135 | ||
135 | static int ali15x3_setup(struct pci_dev *ALI15X3_dev) | 136 | static int ali15x3_setup(struct pci_dev *ALI15X3_dev) |
@@ -166,7 +167,8 @@ static int ali15x3_setup(struct pci_dev *ALI15X3_dev) | |||
166 | if(force_addr) | 167 | if(force_addr) |
167 | ali15x3_smba = force_addr & ~(ALI15X3_SMB_IOSIZE - 1); | 168 | ali15x3_smba = force_addr & ~(ALI15X3_SMB_IOSIZE - 1); |
168 | 169 | ||
169 | if (!request_region(ali15x3_smba, ALI15X3_SMB_IOSIZE, "ali15x3-smb")) { | 170 | if (!request_region(ali15x3_smba, ALI15X3_SMB_IOSIZE, |
171 | ali15x3_driver.name)) { | ||
170 | dev_err(&ALI15X3_dev->dev, | 172 | dev_err(&ALI15X3_dev->dev, |
171 | "ALI15X3_smb region 0x%x already in use!\n", | 173 | "ALI15X3_smb region 0x%x already in use!\n", |
172 | ali15x3_smba); | 174 | ali15x3_smba); |
@@ -470,7 +472,6 @@ static struct i2c_adapter ali15x3_adapter = { | |||
470 | .owner = THIS_MODULE, | 472 | .owner = THIS_MODULE, |
471 | .class = I2C_CLASS_HWMON, | 473 | .class = I2C_CLASS_HWMON, |
472 | .algo = &smbus_algorithm, | 474 | .algo = &smbus_algorithm, |
473 | .name = "unset", | ||
474 | }; | 475 | }; |
475 | 476 | ||
476 | static struct pci_device_id ali15x3_ids[] = { | 477 | static struct pci_device_id ali15x3_ids[] = { |