diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/dvb/frontends/dvb-pll.c | 3 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88-dvb.c | 18 |
2 files changed, 9 insertions, 12 deletions
diff --git a/drivers/media/dvb/frontends/dvb-pll.c b/drivers/media/dvb/frontends/dvb-pll.c index c92877baada2..b7e7108ee5b3 100644 --- a/drivers/media/dvb/frontends/dvb-pll.c +++ b/drivers/media/dvb/frontends/dvb-pll.c | |||
@@ -493,6 +493,9 @@ static int dvb_pll_sleep(struct dvb_frontend *fe) | |||
493 | int i; | 493 | int i; |
494 | int result; | 494 | int result; |
495 | 495 | ||
496 | if (priv->i2c == NULL) | ||
497 | return -EINVAL; | ||
498 | |||
496 | for (i = 0; i < priv->pll_desc->count; i++) { | 499 | for (i = 0; i < priv->pll_desc->count; i++) { |
497 | if (priv->pll_desc->entries[i].limit == 0) | 500 | if (priv->pll_desc->entries[i].limit == 0) |
498 | break; | 501 | break; |
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c index 81654954c338..b39b3629f1d0 100644 --- a/drivers/media/video/cx88/cx88-dvb.c +++ b/drivers/media/video/cx88/cx88-dvb.c | |||
@@ -543,8 +543,7 @@ static int dvb_register(struct cx8802_dev *dev) | |||
543 | &dev->core->i2c_adap); | 543 | &dev->core->i2c_adap); |
544 | if (dev->dvb.frontend != NULL) { | 544 | if (dev->dvb.frontend != NULL) { |
545 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60, | 545 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60, |
546 | &dev->core->i2c_adap, | 546 | NULL, &dvb_pll_thomson_dtt7579); |
547 | &dvb_pll_thomson_dtt7579); | ||
548 | break; | 547 | break; |
549 | } | 548 | } |
550 | /* ZL10353 replaces MT352 on later cards */ | 549 | /* ZL10353 replaces MT352 on later cards */ |
@@ -552,8 +551,7 @@ static int dvb_register(struct cx8802_dev *dev) | |||
552 | &dev->core->i2c_adap); | 551 | &dev->core->i2c_adap); |
553 | if (dev->dvb.frontend != NULL) { | 552 | if (dev->dvb.frontend != NULL) { |
554 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60, | 553 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60, |
555 | &dev->core->i2c_adap, | 554 | NULL, &dvb_pll_thomson_dtt7579); |
556 | &dvb_pll_thomson_dtt7579); | ||
557 | } | 555 | } |
558 | break; | 556 | break; |
559 | case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL: | 557 | case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL: |
@@ -563,8 +561,7 @@ static int dvb_register(struct cx8802_dev *dev) | |||
563 | &dev->core->i2c_adap); | 561 | &dev->core->i2c_adap); |
564 | if (dev->dvb.frontend != NULL) { | 562 | if (dev->dvb.frontend != NULL) { |
565 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, | 563 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, |
566 | &dev->core->i2c_adap, | 564 | NULL, &dvb_pll_thomson_dtt7579); |
567 | &dvb_pll_thomson_dtt7579); | ||
568 | break; | 565 | break; |
569 | } | 566 | } |
570 | /* ZL10353 replaces MT352 on later cards */ | 567 | /* ZL10353 replaces MT352 on later cards */ |
@@ -572,8 +569,7 @@ static int dvb_register(struct cx8802_dev *dev) | |||
572 | &dev->core->i2c_adap); | 569 | &dev->core->i2c_adap); |
573 | if (dev->dvb.frontend != NULL) { | 570 | if (dev->dvb.frontend != NULL) { |
574 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, | 571 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, |
575 | &dev->core->i2c_adap, | 572 | NULL, &dvb_pll_thomson_dtt7579); |
576 | &dvb_pll_thomson_dtt7579); | ||
577 | } | 573 | } |
578 | break; | 574 | break; |
579 | case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1: | 575 | case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1: |
@@ -581,8 +577,7 @@ static int dvb_register(struct cx8802_dev *dev) | |||
581 | &dev->core->i2c_adap); | 577 | &dev->core->i2c_adap); |
582 | if (dev->dvb.frontend != NULL) { | 578 | if (dev->dvb.frontend != NULL) { |
583 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, | 579 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, |
584 | &dev->core->i2c_adap, | 580 | NULL, &dvb_pll_lg_z201); |
585 | &dvb_pll_lg_z201); | ||
586 | } | 581 | } |
587 | break; | 582 | break; |
588 | case CX88_BOARD_KWORLD_DVB_T: | 583 | case CX88_BOARD_KWORLD_DVB_T: |
@@ -592,8 +587,7 @@ static int dvb_register(struct cx8802_dev *dev) | |||
592 | &dev->core->i2c_adap); | 587 | &dev->core->i2c_adap); |
593 | if (dev->dvb.frontend != NULL) { | 588 | if (dev->dvb.frontend != NULL) { |
594 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, | 589 | dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, |
595 | &dev->core->i2c_adap, | 590 | NULL, &dvb_pll_unknown_1); |
596 | &dvb_pll_unknown_1); | ||
597 | } | 591 | } |
598 | break; | 592 | break; |
599 | case CX88_BOARD_DNTV_LIVE_DVB_T_PRO: | 593 | case CX88_BOARD_DNTV_LIVE_DVB_T_PRO: |