projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i2c: Declare more i2c_adapter parent devices
[powerpc.git]
/
drivers
/
media
/
dvb
/
dvb-usb
/
dtt200u-fe.c
diff --git
a/drivers/media/dvb/dvb-usb/dtt200u-fe.c
b/drivers/media/dvb/dvb-usb/dtt200u-fe.c
index
0a94ec2
..
17413ad
100644
(file)
--- a/
drivers/media/dvb/dvb-usb/dtt200u-fe.c
+++ b/
drivers/media/dvb/dvb-usb/dtt200u-fe.c
@@
-18,7
+18,6
@@
struct dtt200u_fe_state {
struct dvb_frontend_parameters fep;
struct dvb_frontend frontend;
struct dvb_frontend_parameters fep;
struct dvb_frontend frontend;
- struct dvb_frontend_ops ops;
};
static int dtt200u_fe_read_status(struct dvb_frontend* fe, fe_status_t *stat)
};
static int dtt200u_fe_read_status(struct dvb_frontend* fe, fe_status_t *stat)
@@
-156,24
+155,20
@@
struct dvb_frontend* dtt200u_fe_attach(struct dvb_usb_device *d)
struct dtt200u_fe_state* state = NULL;
/* allocate memory for the internal state */
struct dtt200u_fe_state* state = NULL;
/* allocate memory for the internal state */
- state =
(struct dtt200u_fe_state*) km
alloc(sizeof(struct dtt200u_fe_state), GFP_KERNEL);
+ state =
kz
alloc(sizeof(struct dtt200u_fe_state), GFP_KERNEL);
if (state == NULL)
goto error;
if (state == NULL)
goto error;
- memset(state,0,sizeof(struct dtt200u_fe_state));
deb_info("attaching frontend dtt200u\n");
state->d = d;
deb_info("attaching frontend dtt200u\n");
state->d = d;
- memcpy(&state->ops,&dtt200u_fe_ops,sizeof(struct dvb_frontend_ops));
-
state->frontend.ops = &state->ops
;
+
memcpy(&state->frontend.ops,&dtt200u_fe_ops,sizeof(struct dvb_frontend_ops))
;
state->frontend.demodulator_priv = state;
state->frontend.demodulator_priv = state;
-
goto success
;
+
return &state->frontend
;
error:
return NULL;
error:
return NULL;
-success:
- return &state->frontend;
}
static struct dvb_frontend_ops dtt200u_fe_ops = {
}
static struct dvb_frontend_ops dtt200u_fe_ops = {