diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-27 22:07:40 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-27 22:07:40 -0400 |
| commit | ff0e0ea2f5d36fa90fc2c57fd019102b0a0cfabf (patch) | |
| tree | 963cdd52a4032cd4827896c4e813cfbf6dd7b3e6 /drivers/media/dvb/frontends/dvb_dummy_fe.c | |
| parent | 43f66a6ce8da299344cf1bc2ac2311889cc88555 (diff) | |
| parent | 1f15d694522af9cd7492695f11dd2dc77b6cf098 (diff) | |
Automatic merge of /spare/repo/netdev-2.6 branch we18
Diffstat (limited to 'drivers/media/dvb/frontends/dvb_dummy_fe.c')
| -rw-r--r-- | drivers/media/dvb/frontends/dvb_dummy_fe.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/dvb/frontends/dvb_dummy_fe.c b/drivers/media/dvb/frontends/dvb_dummy_fe.c index c05a9b05600c..cff93b9d8ab2 100644 --- a/drivers/media/dvb/frontends/dvb_dummy_fe.c +++ b/drivers/media/dvb/frontends/dvb_dummy_fe.c | |||
| @@ -100,7 +100,7 @@ static int dvb_dummy_fe_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t vo | |||
| 100 | 100 | ||
| 101 | static void dvb_dummy_fe_release(struct dvb_frontend* fe) | 101 | static void dvb_dummy_fe_release(struct dvb_frontend* fe) |
| 102 | { | 102 | { |
| 103 | struct dvb_dummy_fe_state* state = (struct dvb_dummy_fe_state*) fe->demodulator_priv; | 103 | struct dvb_dummy_fe_state* state = fe->demodulator_priv; |
| 104 | kfree(state); | 104 | kfree(state); |
| 105 | } | 105 | } |
| 106 | 106 | ||
| @@ -111,7 +111,7 @@ struct dvb_frontend* dvb_dummy_fe_ofdm_attach(void) | |||
| 111 | struct dvb_dummy_fe_state* state = NULL; | 111 | struct dvb_dummy_fe_state* state = NULL; |
| 112 | 112 | ||
| 113 | /* allocate memory for the internal state */ | 113 | /* allocate memory for the internal state */ |
| 114 | state = (struct dvb_dummy_fe_state*) kmalloc(sizeof(struct dvb_dummy_fe_state), GFP_KERNEL); | 114 | state = kmalloc(sizeof(struct dvb_dummy_fe_state), GFP_KERNEL); |
| 115 | if (state == NULL) goto error; | 115 | if (state == NULL) goto error; |
| 116 | 116 | ||
| 117 | /* setup the state */ | 117 | /* setup the state */ |
| @@ -134,7 +134,7 @@ struct dvb_frontend* dvb_dummy_fe_qpsk_attach() | |||
| 134 | struct dvb_dummy_fe_state* state = NULL; | 134 | struct dvb_dummy_fe_state* state = NULL; |
| 135 | 135 | ||
| 136 | /* allocate memory for the internal state */ | 136 | /* allocate memory for the internal state */ |
| 137 | state = (struct dvb_dummy_fe_state*) kmalloc(sizeof(struct dvb_dummy_fe_state), GFP_KERNEL); | 137 | state = kmalloc(sizeof(struct dvb_dummy_fe_state), GFP_KERNEL); |
| 138 | if (state == NULL) goto error; | 138 | if (state == NULL) goto error; |
| 139 | 139 | ||
| 140 | /* setup the state */ | 140 | /* setup the state */ |
| @@ -157,7 +157,7 @@ struct dvb_frontend* dvb_dummy_fe_qam_attach() | |||
| 157 | struct dvb_dummy_fe_state* state = NULL; | 157 | struct dvb_dummy_fe_state* state = NULL; |
| 158 | 158 | ||
| 159 | /* allocate memory for the internal state */ | 159 | /* allocate memory for the internal state */ |
| 160 | state = (struct dvb_dummy_fe_state*) kmalloc(sizeof(struct dvb_dummy_fe_state), GFP_KERNEL); | 160 | state = kmalloc(sizeof(struct dvb_dummy_fe_state), GFP_KERNEL); |
| 161 | if (state == NULL) goto error; | 161 | if (state == NULL) goto error; |
| 162 | 162 | ||
| 163 | /* setup the state */ | 163 | /* setup the state */ |