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/net-2.6
[pandora-kernel.git]
/
drivers
/
media
/
dvb
/
frontends
/
si21xx.c
diff --git
a/drivers/media/dvb/frontends/si21xx.c
b/drivers/media/dvb/frontends/si21xx.c
index
0bd16af
..
9552a22
100644
(file)
--- a/
drivers/media/dvb/frontends/si21xx.c
+++ b/
drivers/media/dvb/frontends/si21xx.c
@@
-928,7
+928,7
@@
struct dvb_frontend *si21xx_attach(const struct si21xx_config *config,
dprintk("%s\n", __func__);
/* allocate memory for the internal state */
- state = k
m
alloc(sizeof(struct si21xx_state), GFP_KERNEL);
+ state = k
z
alloc(sizeof(struct si21xx_state), GFP_KERNEL);
if (state == NULL)
goto error;