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

Commit 4063987c authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mauro Carvalho Chehab
Browse files

[media] cx231xx-i2c: reduce stack size in bus scan 



The cx231xx_do_i2c_scan function needs a lot of stack because
it puts an i2c_client structure on it:

drivers/media/usb/cx231xx/cx231xx-i2c.c: In function 'cx231xx_do_i2c_scan':
drivers/media/usb/cx231xx/cx231xx-i2c.c:518:1: error: the frame size of 1248 bytes is larger than 1152 bytes [-Werror=frame-larger-than=]

This changes it to call i2c_transfer() directly instead, avoiding the
need for the structure.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 6830733d

drivers/media/usb/cx231xx/cx231xx-i2c.c

+10 −6
Original line number Diff line number Diff line
@@ -491,20 +491,24 @@ void cx231xx_do_i2c_scan(struct cx231xx *dev, int i2c_port) 
{

	unsigned char buf;

	int i, rc;

	struct i2c_client client;

	struct i2c_adapter *adap;

	struct i2c_msg msg = {

		.flags = I2C_M_RD,

		.len = 1,

		.buf = &buf,

	};



	if (!i2c_scan)

		return;



	/* Don't generate I2C errors during scan */

	dev->i2c_scan_running = true;



	memset(&client, 0, sizeof(client));

	client.adapter = cx231xx_get_i2c_adap(dev, i2c_port);

	adap = cx231xx_get_i2c_adap(dev, i2c_port);



	for (i = 0; i < 128; i++) {

		client.addr = i;

		rc = i2c_master_recv(&client, &buf, 0);

		msg.addr = i;

		rc = i2c_transfer(adap, &msg, 1);



		if (rc < 0)

			continue;

		dev_info(dev->dev,