usbtuner: fix NPE by unplugging Avermedia tuner device

Bug: 21806987
Bug 1736911
Bug 2190055

Change-Id: I519a5c544266ed4a0cdf01a84f510629d5ec41ed
Signed-off-by: Terry Heo <terryheo@google.com>
Reviewed-on: http://git-master/r/1311290
(cherry picked from commit 9f6dc884345e1c6fab01fa62d013d8c43e00457f)
Signed-off-by: Magdalena Grodzinska <mgrodzinska@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1806529
(cherry picked from commit e15070f05abc532b172a1d58ea0676d4939003ba)
Reviewed-on: https://git-master.nvidia.com/r/1809388
(cherry picked from commit 6f40f844a5e7c3f01ea3998232717cc31dffb010)
Reviewed-on: https://git-master.nvidia.com/r/1938554
Tested-by: Vladislav Zhurba <vzhurba@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Nicolin Chen <nicolinc@nvidia.com>
Reviewed-by: Vinayak Pane <vpane@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

diff --git a/drivers/media/usb/cx231xx/cx231xx-dvb.c b/drivers/media/usb/cx231xx/cx231xx-dvb.c
index e11a0ad5a2fa2996fb4cb9a18825c5b473808cb8..d6c0786ebda6d3415af8e42edb1eb0babcf72b75 100644 (file)
--- a/drivers/media/usb/cx231xx/cx231xx-dvb.c
+++ b/drivers/media/usb/cx231xx/cx231xx-dvb.c
@@ -373,11 +373,11 @@ static int cx231xx_dvb_bus_ctrl(struct dvb_frontend *fe, int acquire)
        struct cx231xx_dvb *dvb = dev->dvb;
 
        if (acquire) {
-               if (is_model_avermedia_h837_series(dev->model))
+               if (dvb != NULL && is_model_avermedia_h837_series(dev->model))
                        ++dvb->power_on;
                return cx231xx_set_mode(dev, CX231XX_DIGITAL_MODE);
        }
-       if (is_model_avermedia_h837_series(dev->model)) {
+       if (dvb != NULL && is_model_avermedia_h837_series(dev->model)) {
                --dvb->power_on;
                if (dvb->power_on)
                        return 0;