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/usb-audio' into for-linus
[pandora-kernel.git]
/
drivers
/
media
/
dvb
/
frontends
/
stv0299.c
diff --git
a/drivers/media/dvb/frontends/stv0299.c
b/drivers/media/dvb/frontends/stv0299.c
index
6c1cb19
..
9688744
100644
(file)
--- a/
drivers/media/dvb/frontends/stv0299.c
+++ b/
drivers/media/dvb/frontends/stv0299.c
@@
-667,7
+667,7
@@
struct dvb_frontend* stv0299_attach(const struct stv0299_config* config,
int id;
/* allocate memory for the internal state */
- state = k
m
alloc(sizeof(struct stv0299_state), GFP_KERNEL);
+ state = k
z
alloc(sizeof(struct stv0299_state), GFP_KERNEL);
if (state == NULL) goto error;
/* setup the state */