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 branch 'topic/ice1724-pm' into for-linus
[pandora-kernel.git]
/
drivers
/
media
/
dvb
/
frontends
/
sp887x.c
diff --git
a/drivers/media/dvb/frontends/sp887x.c
b/drivers/media/dvb/frontends/sp887x.c
index
559509a
..
4a7c3d8
100644
(file)
--- a/
drivers/media/dvb/frontends/sp887x.c
+++ b/
drivers/media/dvb/frontends/sp887x.c
@@
-557,7
+557,7
@@
struct dvb_frontend* sp887x_attach(const struct sp887x_config* config,
struct sp887x_state* state = NULL;
/* allocate memory for the internal state */
struct sp887x_state* state = NULL;
/* allocate memory for the internal state */
- state = k
m
alloc(sizeof(struct sp887x_state), GFP_KERNEL);
+ state = k
z
alloc(sizeof(struct sp887x_state), GFP_KERNEL);
if (state == NULL) goto error;
/* setup the state */
if (state == NULL) goto error;
/* setup the state */