Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80257121 authored by Wolfram Sang's avatar Wolfram Sang Committed by Greg Kroah-Hartman
Browse files

misc: eeprom: ee1004: convert to i2c_new_dummy_device 



Move from i2c_new_dummy() to i2c_new_dummy_device(), so we now get an
ERRPTR which we use in error handling.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20190722172616.3982-2-wsa+renesas@sang-engineering.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5f9e832c

drivers/misc/eeprom/ee1004.c

+3 −3
Original line number Diff line number Diff line
@@ -195,13 +195,13 @@ 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(client->adapter,

			ee1004_set_page[cnr] = i2c_new_dummy_device(client->adapter,

						EE1004_ADDR_SET_PAGE + cnr);

			if (!ee1004_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 = -EADDRINUSE;

				err = PTR_ERR(ee1004_set_page[cnr]);

				goto err_clients;

			}

		}