Skip to content

Commit

Permalink
V4L/DVB (7286): limit stack usage of ir-kbd-i2c.c
Browse files Browse the repository at this point in the history
ir_probe allocated struct i2c_client on stack;
it's pretty big structure, so allocate it with kzalloc

make checkstack output without this patch:
x059d ir_probe [ir-kbd-i2c]:                           1000

Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Marcin Slusarz authored and Mauro Carvalho Chehab committed Apr 24, 2008
1 parent 1c3bf59 commit a588585
Showing 1 changed file with 11 additions and 7 deletions.
18 changes: 11 additions & 7 deletions drivers/media/video/ir-kbd-i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -509,9 +509,9 @@ static int ir_probe(struct i2c_adapter *adap)
static const int probe_cx88[] = { 0x18, 0x6b, 0x71, -1 };
static const int probe_cx23885[] = { 0x6b, -1 };
const int *probe = NULL;
struct i2c_client c;
struct i2c_client *c;
unsigned char buf;
int i,rc;
int i, rc;

switch (adap->id) {
case I2C_HW_B_BT848:
Expand All @@ -536,19 +536,23 @@ static int ir_probe(struct i2c_adapter *adap)
if (NULL == probe)
return 0;

memset(&c,0,sizeof(c));
c.adapter = adap;
c = kzalloc(sizeof(*c), GFP_KERNEL);
if (!c)
return -ENOMEM;

c->adapter = adap;
for (i = 0; -1 != probe[i]; i++) {
c.addr = probe[i];
rc = i2c_master_recv(&c,&buf,0);
c->addr = probe[i];
rc = i2c_master_recv(c, &buf, 0);
dprintk(1,"probe 0x%02x @ %s: %s\n",
probe[i], adap->name,
(0 == rc) ? "yes" : "no");
if (0 == rc) {
ir_attach(adap,probe[i],0,0);
ir_attach(adap, probe[i], 0, 0);
break;
}
}
kfree(c);
return 0;
}

Expand Down

0 comments on commit a588585

Please sign in to comment.