luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

V4L/DVB (7751): ir-kbd-i2c: Save a temporary memory allocation in ir_probe

Browse Source 
Using i2c_transfer instead of i2c_master_recv in ir_probe saves a
temporary memory allocation.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Jean Delvare 2008-04-25 20:42:45 -03:00 committed by Mauro Carvalho Chehab
parent b33d24c4cc
commit 37c45df740
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/media/video/ir-kbd-i2c.c
View File

@ -509,8 +509,11 @@ 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;
struct i2c_client *c;
unsigned char buf;
struct i2c_msg msg = {
.flags = I2C_M_RD,
.len = 0,
.buf = NULL,
};
int i, rc;
switch (adap->id) {
@ -536,23 +539,17 @@ static int ir_probe(struct i2c_adapter *adap)
return 0;
}
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);
msg.addr = probe[i];
rc = i2c_transfer(adap, &msg, 1);
dprintk(1,"probe 0x%02x @ %s: %s\n",
probe[i], adap->name,
(0 == rc) ? "yes" : "no");
if (0 == rc) {
(1 == rc) ? "yes" : "no");
if (1 == rc) {
ir_attach(adap, probe[i], 0, 0);
break;
}
}
kfree(c);
return 0;
}