diff options
| author | Heiner Kallweit <hkallweit1@gmail.com> | 2021-05-24 22:13:12 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-27 14:49:39 +0200 |
| commit | 3c03dad7652ee2b30728a263905de93a79205477 (patch) | |
| tree | 793b11827bb40be9d0a2f4d2a86208a847497206 /drivers/misc | |
| parent | 08e5138aa419350d0a168abeac3ecec4b7e779be (diff) | |
| download | linux-stable-3c03dad7652ee2b30728a263905de93a79205477.tar.gz linux-stable-3c03dad7652ee2b30728a263905de93a79205477.tar.bz2 linux-stable-3c03dad7652ee2b30728a263905de93a79205477.zip | |
eeprom: ee1004: Improve creating dummy devices
i2c_new_dummy_device() calls i2c_new_client_device() that complains
if it fails to create the device. Therefore we don't have to emit an
error message in case of failure. In addition ensure that
ee1004_set_page is only set if creating the device succeeded.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Link: https://lore.kernel.org/r/d38df5ac-6ecb-7d5f-b5c3-39bfc6a1e8a1@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/eeprom/ee1004.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/misc/eeprom/ee1004.c b/drivers/misc/eeprom/ee1004.c index 0d497e0e4a51..4b2c60a1828c 100644 --- a/drivers/misc/eeprom/ee1004.c +++ b/drivers/misc/eeprom/ee1004.c @@ -179,15 +179,14 @@ static int ee1004_probe(struct i2c_client *client, mutex_lock(&ee1004_bus_lock); if (++ee1004_dev_count == 1) { for (cnr = 0; cnr < 2; cnr++) { - ee1004_set_page[cnr] = i2c_new_dummy_device(client->adapter, - EE1004_ADDR_SET_PAGE + cnr); - if (IS_ERR(ee1004_set_page[cnr])) { - dev_err(&client->dev, - "address 0x%02x unavailable\n", - EE1004_ADDR_SET_PAGE + cnr); - err = PTR_ERR(ee1004_set_page[cnr]); + struct i2c_client *cl; + + cl = i2c_new_dummy_device(client->adapter, EE1004_ADDR_SET_PAGE + cnr); + if (IS_ERR(cl)) { + err = PTR_ERR(cl); goto err_clients; } + ee1004_set_page[cnr] = cl; } } else if (client->adapter != ee1004_set_page[0]->adapter) { dev_err(&client->dev, |