Patch "media: dvb-usb-v2: lmedm04: move ts2020 attach to dm04_lme2510_tuner" has been added to the 4.9-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
media: dvb-usb-v2: lmedm04: move ts2020 attach to dm04_lme2510_tuner
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
media-dvb-usb-v2-lmedm04-move-ts2020-attach-to-dm04_lme2510_tuner.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
7bf7a7116ed313c601307f7e585419369926ab05Mon Sep 17 00:00:00 2001
From: Malcolm Priestley <[email protected]>
Date: Tue, 26 Sep 2017 17:10:21 -0400
Subject: media: dvb-usb-v2: lmedm04: move ts2020 attach to dm04_lme2510_tuner
From: Malcolm Priestley <[email protected]>
commit 7bf7a7116ed313c601307f7e585419369926ab05 upstream.
When the tuner was split from m88rs2000 the attach function is in wrong place.
Move to dm04_lme2510_tuner to trap errors on failure and removing a call to lme_coldreset.
Prevents driver starting up without any tuner connected.
Fixes to trap for ts2020 fail.
LME2510(C): FE Found M88RS2000
ts2020: probe of 0-0060 failed with error -11
...
LME2510(C): TUN Found RS2000 tuner
kasan: CONFIG_KASAN_INLINE enabled
kasan: GPF could be caused by NULL-ptr deref or user memory access
general protection fault: 0000 [#1] PREEMPT SMP KASAN
--- drivers/media/usb/dvb-usb-v2/lmedm04.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/media/usb/dvb-usb-v2/lmedm04.c +6 -7
@@ -1084,8 +1084,6 @@ static int dm04_lme2510_frontend_attach(if (adap->fe[0 ]) {info ("FE Found M88RS2000" ); -dvb_attach (ts2020_attach, adap->fe[0 ], &ts2020_config, - &d->i2c_adap); st->i2c_tuner_gate_w =5 ; st->i2c_tuner_gate_r =5 ; st->i2c_tuner_addr =0x60 ;
@@ -1151,17 +1149,18 @@ static int dm04_lme2510_tuner(struct dvb ret = st->tuner_config;break ;case TUNER_RS2000 : - ret = st->tuner_config; +if (dvb_attach (ts2020_attach, adap->fe[0 ], + &ts2020_config, &d->i2c_adap)) + ret = st->tuner_config;break ;default :break ; } -if (ret) +if (ret) {info ("TUN Found %s tuner" , tun_msg[ret]); -else { -info ("TUN No tuner found --- resetting device" ); -lme_coldreset (d); + }else { +info ("TUN No tuner found" );return -ENODEV ; }
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/media-dvb-usb-v2-lmedm04-move-ts2020-attach-to-dm04_lme2510_tuner.patch queue-4.9/media-dvb-usb-v2-lmedm04-improve-logic-checking-of-warm-start.patch