Commit 249b4dea authored by Guenter Roeck's avatar Guenter Roeck Committed by Greg Kroah-Hartman
Browse files

eeprom: ee1004: Call i2c_new_scanned_device to instantiate thermal sensor



Instantiating a device by calling i2c_new_client_device() assumes that the
device is not already instantiated. If that is not the case, it will return
an error and generate a misleading kernel log message.

i2c i2c-0: Failed to register i2c client jc42 at 0x18 (-16)

This can be reproduced by unloading the ee1004 driver and loading it again.

Avoid this by calling i2c_new_scanned_device() instead, which returns
silently if a device is already instantiated or does not exist.

Fixes: 393bd100 ("eeprom: ee1004: add support for temperature sensor")
Cc: Heiner Kallweit <hkallweit1@gmail.com>
Cc: Thomas Weißschuh <linux@weissschuh.net>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20240629173716.20389-1-linux@roeck-us.net


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 79d0df36
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -184,6 +184,8 @@ static int ee1004_read(void *priv, unsigned int off, void *val, size_t count)
static void ee1004_probe_temp_sensor(struct i2c_client *client)
{
	struct i2c_board_info info = { .type = "jc42" };
	unsigned short addr = 0x18 | (client->addr & 7);
	unsigned short addr_list[] = { addr, I2C_CLIENT_END };
	u8 byte14;
	int ret;

@@ -192,9 +194,7 @@ static void ee1004_probe_temp_sensor(struct i2c_client *client)
	if (ret != 1 || !(byte14 & BIT(7)))
		return;

	info.addr = 0x18 | (client->addr & 7);

	i2c_new_client_device(client->adapter, &info);
	i2c_new_scanned_device(client->adapter, &info, addr_list, NULL);
}

static void ee1004_cleanup(int idx, struct ee1004_bus_data *bd)