These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / media / pci / ngene / ngene-core.c

diff --git a/kernel/drivers/media/pci/ngene/ngene-core.c b/kernel/drivers/media/pci/ngene/ngene-core.c
index e29bc3a..1b92d83 100644 (file)
--- a/kernel/drivers/media/pci/ngene/ngene-core.c
+++ b/kernel/drivers/media/pci/ngene/ngene-core.c
@@ -1526,10 +1526,12 @@ static int init_channel(struct ngene_channel *chan)
        if (chan->fe2) {
                if (dvb_register_frontend(adapter, chan->fe2) < 0)
                        goto err;
-               chan->fe2->tuner_priv = chan->fe->tuner_priv;
-               memcpy(&chan->fe2->ops.tuner_ops,
-                      &chan->fe->ops.tuner_ops,
-                      sizeof(struct dvb_tuner_ops));
+               if (chan->fe) {
+                       chan->fe2->tuner_priv = chan->fe->tuner_priv;
+                       memcpy(&chan->fe2->ops.tuner_ops,
+                              &chan->fe->ops.tuner_ops,
+                              sizeof(struct dvb_tuner_ops));
+               }
        }
 
        if (chan->has_demux) {