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

Commit 188f3457 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (6465): Use correct error codes when chip is not recognized 



If the chip isn't recognized, then the correct errors should be returned.
The v4l2_i2c_attach() utility function will return 0 for all errors
except -ENOMEM to provide proper compatibility support for the old I2C
probing function.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 6235168d

drivers/media/video/cs53l32a.c

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ static int cs53l32a_probe(struct i2c_client *client) 


	/* Check if the adapter supports the needed features */

	if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))

		return 0;

		return -EIO;



	snprintf(client->name, sizeof(client->name) - 1, "cs53l32a");

drivers/media/video/cx25840/cx25840-core.c

+5 −1
Original line number Diff line number Diff line
@@ -1078,6 +1078,10 @@ static int cx25840_probe(struct i2c_client *client) 
	u32 id;

	u16 device_id;



	/* Check if the adapter supports the needed features */

	if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))

		return -EIO;



	v4l_dbg(1, cx25840_debug, client, "detecting cx25840 client on address 0x%x\n", client->addr << 1);



	device_id = cx25840_read(client, 0x101) << 8;
@@ -1093,7 +1097,7 @@ static int cx25840_probe(struct i2c_client *client) 
	}

	else {

		v4l_dbg(1, cx25840_debug, client, "cx25840 not found\n");

		return 0;

		return -ENODEV;

	}



	state = kzalloc(sizeof(struct cx25840_state), GFP_KERNEL);

drivers/media/video/msp3400-driver.c

+2 −2
Original line number Diff line number Diff line
@@ -812,7 +812,7 @@ static int msp_probe(struct i2c_client *client) 


	if (msp_reset(client) == -1) {

		v4l_dbg(1, msp_debug, client, "msp3400 not found\n");

		return 0;

		return -ENODEV;

	}



	state = kzalloc(sizeof(*state), GFP_KERNEL);
@@ -844,7 +844,7 @@ static int msp_probe(struct i2c_client *client) 
	if (state->rev1 == -1 || (state->rev1 == 0 && state->rev2 == 0)) {

		v4l_dbg(1, msp_debug, client, "not an msp3400 (cannot read chip version)\n");

		kfree(state);

		return 0;

		return -ENODEV;

	}



	msp_set_audio(client);

drivers/media/video/saa7115.c

+2 −2
Original line number Diff line number Diff line
@@ -1459,7 +1459,7 @@ static int saa7115_probe(struct i2c_client *client) 


	/* Check if the adapter supports the needed features */

	if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))

		return 0;

		return -EIO;



	snprintf(client->name, sizeof(client->name) - 1, "saa7115");
@@ -1478,7 +1478,7 @@ static int saa7115_probe(struct i2c_client *client) 
	if (memcmp(name, "1f711", 5)) {

		v4l_dbg(1, debug, client, "chip found @ 0x%x (ID %s) does not match a known saa711x chip.\n",

			client->addr << 1, name);

		return 0;

		return -ENODEV;

	}



	snprintf(client->name, sizeof(client->name) - 1, "saa711%d",chip_id);

drivers/media/video/saa7127.c

+3 −3
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ static int saa7127_probe(struct i2c_client *client) 


	/* Check if the adapter supports the needed features */

	if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))

		return 0;

		return -EIO;



	snprintf(client->name, sizeof(client->name) - 1, "saa7127");
@@ -685,12 +685,12 @@ static int saa7127_probe(struct i2c_client *client) 
	if ((saa7127_read(client, 0) & 0xe4) != 0 ||

			(saa7127_read(client, 0x29) & 0x3f) != 0x1d) {

		v4l_dbg(1, debug, client, "saa7127 not found\n");

		return 0;

		return -ENODEV;

	}

	state = kzalloc(sizeof(struct saa7127_state), GFP_KERNEL);



	if (state == NULL) {

		return (-ENOMEM);

		return -ENOMEM;

	}



	i2c_set_clientdata(client, state);