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
/
tda1004x.c
diff --git
a/drivers/media/dvb/frontends/tda1004x.c
b/drivers/media/dvb/frontends/tda1004x.c
index
4981cef
..
f2a8abe
100644
(file)
--- a/
drivers/media/dvb/frontends/tda1004x.c
+++ b/
drivers/media/dvb/frontends/tda1004x.c
@@
-1269,7
+1269,7
@@
struct dvb_frontend* tda10045_attach(const struct tda1004x_config* config,
int id;
/* allocate memory for the internal state */
int id;
/* allocate memory for the internal state */
- state = k
m
alloc(sizeof(struct tda1004x_state), GFP_KERNEL);
+ state = k
z
alloc(sizeof(struct tda1004x_state), GFP_KERNEL);
if (!state) {
printk(KERN_ERR "Can't alocate memory for tda10045 state\n");
return NULL;
if (!state) {
printk(KERN_ERR "Can't alocate memory for tda10045 state\n");
return NULL;
@@
-1339,7
+1339,7
@@
struct dvb_frontend* tda10046_attach(const struct tda1004x_config* config,
int id;
/* allocate memory for the internal state */
int id;
/* allocate memory for the internal state */
- state = k
m
alloc(sizeof(struct tda1004x_state), GFP_KERNEL);
+ state = k
z
alloc(sizeof(struct tda1004x_state), GFP_KERNEL);
if (!state) {
printk(KERN_ERR "Can't alocate memory for tda10046 state\n");
return NULL;
if (!state) {
printk(KERN_ERR "Can't alocate memory for tda10046 state\n");
return NULL;