adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 19:56:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix generic fb_ddc i2c edid probe msg

Browse source 
Benh points out that the msgs[0].flags entry never got initialized, and
since it's an automatic stack allocation, it could have any random
value, which is bad.

Rewrite the initializer to explicitly initialize all fields of the small
i2c_msg structure array we generate.  Just to keep it all obvious, let's
handle msgs[1].buf in the same initializer while we're at it, instead of
initializing that one separately later.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Linus Torvalds 2006-11-16 22:18:28 -08:00
parent 4f71c5de19
commit 4be703906c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/video/fb_ddc.c
View file

@ -20,26 +20,26 @@
static unsigned char *fb_do_probe_ddc_edid(struct i2c_adapter *adapter) static unsigned char *fb_do_probe_ddc_edid(struct i2c_adapter *adapter)
{ {
unsigned char start = 0x0; unsigned char start = 0x0;
unsigned char *buf = kmalloc(EDID_LENGTH, GFP_KERNEL);
struct i2c_msg msgs[] = { struct i2c_msg msgs[] = {
{ {
.addr = DDC_ADDR, .addr = DDC_ADDR,
.flags = 0,
.len = 1, .len = 1,
.buf = &start, .buf = &start,
}, { }, {
.addr = DDC_ADDR, .addr = DDC_ADDR,
.flags = I2C_M_RD, .flags = I2C_M_RD,
.len = EDID_LENGTH, .len = EDID_LENGTH,
.buf = buf,
} }
}; };
unsigned char *buf;
buf = kmalloc(EDID_LENGTH, GFP_KERNEL);
if (!buf) { if (!buf) {
dev_warn(&adapter->dev, "unable to allocate memory for EDID " dev_warn(&adapter->dev, "unable to allocate memory for EDID "
"block.\n"); "block.\n");
return NULL; return NULL;
} }
msgs[1].buf = buf;
if (i2c_transfer(adapter, msgs, 2) == 2) if (i2c_transfer(adapter, msgs, 2) == 2)
return buf; return buf;