From: Igor M. Liplianin Date: Sun, 27 Feb 2011 20:29:55 +0000 (-0300) Subject: [media] ds3000: wrong hardware tune function implemented X-Git-Tag: v2.6.39-rc1~86^2~201 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=738e8ff90fae01dccc9e7f92e0cfa4819567dbb8;p=~shefty%2Frdma-dev.git [media] ds3000: wrong hardware tune function implemented It is taken from another tree, where it is modified. Patch to fix that Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/dvb/frontends/ds3000.c b/drivers/media/dvb/frontends/ds3000.c index 7f3d118287c..90bf573308b 100644 --- a/drivers/media/dvb/frontends/ds3000.c +++ b/drivers/media/dvb/frontends/ds3000.c @@ -1220,9 +1220,20 @@ static int ds3000_set_frontend(struct dvb_frontend *fe, } static int ds3000_tune(struct dvb_frontend *fe, - struct dvb_frontend_parameters *p) + struct dvb_frontend_parameters *p, + unsigned int mode_flags, + unsigned int *delay, + fe_status_t *status) { - return ds3000_set_frontend(fe, p); + if (p) { + int ret = ds3000_set_frontend(fe, p); + if (ret) + return ret; + } + + *delay = HZ / 5; + + return ds3000_read_status(fe, status); } static enum dvbfe_algo ds3000_get_algo(struct dvb_frontend *fe)