diff options
| author | Corey Minyard <cminyard@mvista.com> | 2017-06-16 23:38:20 +0200 |
|---|---|---|
| committer | Corey Minyard <cminyard@mvista.com> | 2017-06-16 23:56:38 +0200 |
| commit | be8647d2bea48a15a685c855dda33d22e9550493 (patch) | |
| tree | 0c94cb3737a40848bf9b2d47c5d152de2fa3adfa /drivers/char/ipmi | |
| parent | ipmi: Use the proper default value for register size in ACPI (diff) | |
| download | linux-be8647d2bea48a15a685c855dda33d22e9550493.tar.xz linux-be8647d2bea48a15a685c855dda33d22e9550493.zip | |
ipmi:ssif: Use i2c_adapter_id instead of adapter->nr
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Diffstat (limited to 'drivers/char/ipmi')
| -rw-r--r-- | drivers/char/ipmi/ipmi_ssif.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c index 1d4fd846e457..05e18041c357 100644 --- a/drivers/char/ipmi/ipmi_ssif.c +++ b/drivers/char/ipmi/ipmi_ssif.c @@ -1096,7 +1096,7 @@ static int inc_usecount(void *send_info) { struct ssif_info *ssif_info = send_info; - if (!i2c_get_adapter(ssif_info->client->adapter->nr)) + if (!i2c_get_adapter(i2c_adapter_id(ssif_info->client->adapter))) return -ENODEV; i2c_use_client(ssif_info->client); @@ -1665,7 +1665,8 @@ static int ssif_probe(struct i2c_client *client, const struct i2c_device_id *id) { unsigned int thread_num; - thread_num = ((ssif_info->client->adapter->nr << 8) | + thread_num = ((i2c_adapter_id(ssif_info->client->adapter) + << 8) | ssif_info->client->addr); init_completion(&ssif_info->wake_thread); ssif_info->thread = kthread_run(ipmi_ssif_thread, ssif_info, |