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
/
cx22700.c
diff --git
a/drivers/media/dvb/frontends/cx22700.c
b/drivers/media/dvb/frontends/cx22700.c
index
ace5cb1
..
fbd838e
100644
(file)
--- a/
drivers/media/dvb/frontends/cx22700.c
+++ b/
drivers/media/dvb/frontends/cx22700.c
@@
-380,7
+380,7
@@
struct dvb_frontend* cx22700_attach(const struct cx22700_config* config,
struct cx22700_state* state = NULL;
/* allocate memory for the internal state */
struct cx22700_state* state = NULL;
/* allocate memory for the internal state */
- state = k
m
alloc(sizeof(struct cx22700_state), GFP_KERNEL);
+ state = k
z
alloc(sizeof(struct cx22700_state), GFP_KERNEL);
if (state == NULL) goto error;
/* setup the state */
if (state == NULL) goto error;
/* setup the state */