Commit 7f3c2e1d authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

[media] cx231xx: fix compiler warning

Fix this compiler warning by allocating a structure to read the eeprom instead
of doing it on the stack and worse: the eeprom array is static, so that can
cause problems if there are multiple cx231xx instances.

cx231xx-cards.c: In function 'cx231xx_card_setup':
cx231xx-cards.c:1110:1: warning: the frame size of 2064 bytes is larger than 2048 bytes [-Wframe-larger-than=]
 }
 ^

I did consider removing the code altogether since the result is actually
not used at the moment, but I decided against it since it is used in other
drivers and someone might want to start using it in this driver as well. And
then it is useful that the code is already there.
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent d0154d83
...@@ -1092,17 +1092,25 @@ void cx231xx_card_setup(struct cx231xx *dev) ...@@ -1092,17 +1092,25 @@ void cx231xx_card_setup(struct cx231xx *dev)
case CX231XX_BOARD_HAUPPAUGE_930C_HD_1114xx: case CX231XX_BOARD_HAUPPAUGE_930C_HD_1114xx:
case CX231XX_BOARD_HAUPPAUGE_955Q: case CX231XX_BOARD_HAUPPAUGE_955Q:
{ {
struct eeprom {
struct tveeprom tvee; struct tveeprom tvee;
static u8 eeprom[256]; u8 eeprom[256];
struct i2c_client client; struct i2c_client client;
};
struct eeprom *e = kzalloc(sizeof(*e), GFP_KERNEL);
memset(&client, 0, sizeof(client)); if (e == NULL) {
client.adapter = cx231xx_get_i2c_adap(dev, I2C_1_MUX_1); dev_err(dev->dev,
client.addr = 0xa0 >> 1; "failed to allocate memory to read eeprom\n");
break;
}
e->client.adapter = cx231xx_get_i2c_adap(dev, I2C_1_MUX_1);
e->client.addr = 0xa0 >> 1;
read_eeprom(dev, &client, eeprom, sizeof(eeprom)); read_eeprom(dev, &e->client, e->eeprom, sizeof(e->eeprom));
tveeprom_hauppauge_analog(&client, tveeprom_hauppauge_analog(&e->client,
&tvee, eeprom + 0xc0); &e->tvee, e->eeprom + 0xc0);
kfree(e);
break; break;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment