diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-06 00:11:38 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-06 00:11:42 -0400 |
| commit | ed011b22ce567eabefa9ea571d3721c10ecd0553 (patch) | |
| tree | c7aee6684613075c772388a99a9137014549434e /drivers/media/dvb/frontends/cx22700.c | |
| parent | 85bac32c4a52c592b857f2c360cc5ec93a097d70 (diff) | |
| parent | e07cccf4046978df10f2e13fe2b99b2f9b3a65db (diff) | |
Merge commit 'v2.6.31-rc9' into tracing/core
Merge reason: move from -rc5 to -rc9.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/media/dvb/frontends/cx22700.c')
| -rw-r--r-- | drivers/media/dvb/frontends/cx22700.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/frontends/cx22700.c b/drivers/media/dvb/frontends/cx22700.c index ace5cb17165d..fbd838eca268 100644 --- 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, | |||
| 380 | struct cx22700_state* state = NULL; | 380 | struct cx22700_state* state = NULL; |
| 381 | 381 | ||
| 382 | /* allocate memory for the internal state */ | 382 | /* allocate memory for the internal state */ |
| 383 | state = kmalloc(sizeof(struct cx22700_state), GFP_KERNEL); | 383 | state = kzalloc(sizeof(struct cx22700_state), GFP_KERNEL); |
| 384 | if (state == NULL) goto error; | 384 | if (state == NULL) goto error; |
| 385 | 385 | ||
| 386 | /* setup the state */ | 386 | /* setup the state */ |