From: Andreas Oberritter Date: Thu, 4 Aug 2011 15:33:14 +0000 (-0300) Subject: [media] DVB: dvb_frontend: clear stale events on FE_SET_FRONTEND X-Git-Tag: MMI-PSA29.97-13-9~18177^2~280 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=20640bea87c31a823dba3756b1a5248197f0905f;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git [media] DVB: dvb_frontend: clear stale events on FE_SET_FRONTEND the first event after an attempt to tune. Signed-off-by: Andreas Oberritter Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c index 45ea843d93de..410231112204 100644 --- a/drivers/media/dvb/dvb-core/dvb_frontend.c +++ b/drivers/media/dvb/dvb-core/dvb_frontend.c @@ -220,6 +220,16 @@ static int dvb_frontend_get_event(struct dvb_frontend *fe, return 0; } +static void dvb_frontend_clear_events(struct dvb_frontend *fe) +{ + struct dvb_frontend_private *fepriv = fe->frontend_priv; + struct dvb_fe_events *events = &fepriv->events; + + mutex_lock(&events->mtx); + events->eventr = events->eventw; + mutex_unlock(&events->mtx); +} + static void dvb_frontend_init(struct dvb_frontend *fe) { dprintk ("DVB: initialising adapter %i frontend %i (%s)...\n", @@ -1891,6 +1901,7 @@ static int dvb_frontend_ioctl_legacy(struct file *file, /* Request the search algorithm to search */ fepriv->algo_status |= DVBFE_ALGO_SEARCH_AGAIN; + dvb_frontend_clear_events(fe); dvb_frontend_add_event(fe, 0); dvb_frontend_wakeup(fe); fepriv->status = 0;