git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
drivers
/
media
/
video
/
upd64083.c
diff --git
a/drivers/media/video/upd64083.c
b/drivers/media/video/upd64083.c
index
28e0e6b
..
9bbe617
100644
(file)
--- a/
drivers/media/video/upd64083.c
+++ b/
drivers/media/video/upd64083.c
@@
-202,7
+202,7
@@
static int upd64083_probe(struct i2c_client *client,
v4l_info(client, "chip found @ 0x%x (%s)\n",
client->addr << 1, client->adapter->name);
v4l_info(client, "chip found @ 0x%x (%s)\n",
client->addr << 1, client->adapter->name);
- state = k
m
alloc(sizeof(struct upd64083_state), GFP_KERNEL);
+ state = k
z
alloc(sizeof(struct upd64083_state), GFP_KERNEL);
if (state == NULL)
return -ENOMEM;
sd = &state->sd;
if (state == NULL)
return -ENOMEM;
sd = &state->sd;