From 337f473c1c67f64de14bb8aef40c7714fca8adbd Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 31 Dec 2011 07:03:36 -0300 Subject: [PATCH] --- yaml --- r: 285579 b: refs/heads/master c: 0009e0e3e60b1e4e781e5bc5efd09b48cb397c7f h: refs/heads/master i: 285577: 0634057e8d4cad734247a9aaf9419d3bf45a7e53 285575: 5a842b4bb7e749c012a047fae2228ef132f768fd v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/dvb-usb/af9015.c | 5 ++--- trunk/drivers/media/dvb/dvb-usb/af9015.h | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index bd7105b2c1de..e6e61b220798 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 59d3cc1975db3676da707ea7083dc7e15117409d +refs/heads/master: 0009e0e3e60b1e4e781e5bc5efd09b48cb397c7f diff --git a/trunk/drivers/media/dvb/dvb-usb/af9015.c b/trunk/drivers/media/dvb/dvb-usb/af9015.c index 7b606b7834b3..7959053d54ed 100644 --- a/trunk/drivers/media/dvb/dvb-usb/af9015.c +++ b/trunk/drivers/media/dvb/dvb-usb/af9015.c @@ -1096,8 +1096,7 @@ static int af9015_rc_query(struct dvb_usb_device *d) } /* override demod callbacks for resource locking */ -static int af9015_af9013_set_frontend(struct dvb_frontend *fe, - struct dvb_frontend_parameters *params) +static int af9015_af9013_set_frontend(struct dvb_frontend *fe) { int ret; struct dvb_usb_adapter *adap = fe->dvb->priv; @@ -1106,7 +1105,7 @@ static int af9015_af9013_set_frontend(struct dvb_frontend *fe, if (mutex_lock_interruptible(&adap->dev->usb_mutex)) return -EAGAIN; - ret = priv->set_frontend[adap->id](fe, params); + ret = priv->set_frontend[adap->id](fe); mutex_unlock(&adap->dev->usb_mutex); diff --git a/trunk/drivers/media/dvb/dvb-usb/af9015.h b/trunk/drivers/media/dvb/dvb-usb/af9015.h index 4a126177e101..f619063fa72f 100644 --- a/trunk/drivers/media/dvb/dvb-usb/af9015.h +++ b/trunk/drivers/media/dvb/dvb-usb/af9015.h @@ -104,8 +104,7 @@ struct af9015_state { u8 rc_last[4]; /* for demod callback override */ - int (*set_frontend[2]) (struct dvb_frontend *fe, - struct dvb_frontend_parameters *params); + int (*set_frontend[2]) (struct dvb_frontend *fe); int (*read_status[2]) (struct dvb_frontend *fe, fe_status_t *status); int (*init[2]) (struct dvb_frontend *fe); int (*sleep[2]) (struct dvb_frontend *fe);