diff options
-rw-r--r-- | drivers/media/video/cx88/cx88-blackbird.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c index 7ce37f46b753..4a0e1f8992cd 100644 --- a/drivers/media/video/cx88/cx88-blackbird.c +++ b/drivers/media/video/cx88/cx88-blackbird.c | |||
@@ -541,9 +541,7 @@ static int blackbird_initialize_codec(struct cx8802_dev *dev) | |||
541 | 541 | ||
542 | /* ping was not successful, reset and upload firmware */ | 542 | /* ping was not successful, reset and upload firmware */ |
543 | cx_write(MO_SRST_IO, 0); /* SYS_RSTO=0 */ | 543 | cx_write(MO_SRST_IO, 0); /* SYS_RSTO=0 */ |
544 | msleep(1); | ||
545 | cx_write(MO_SRST_IO, 1); /* SYS_RSTO=1 */ | 544 | cx_write(MO_SRST_IO, 1); /* SYS_RSTO=1 */ |
546 | msleep(1); | ||
547 | retval = blackbird_load_firmware(dev); | 545 | retval = blackbird_load_firmware(dev); |
548 | if (retval < 0) | 546 | if (retval < 0) |
549 | return retval; | 547 | return retval; |
@@ -565,7 +563,6 @@ static int blackbird_initialize_codec(struct cx8802_dev *dev) | |||
565 | } | 563 | } |
566 | dprintk(0, "Firmware version is 0x%08x\n", version); | 564 | dprintk(0, "Firmware version is 0x%08x\n", version); |
567 | } | 565 | } |
568 | msleep(1); | ||
569 | 566 | ||
570 | cx_write(MO_PINMUX_IO, 0x88); /* 656-8bit IO and enable MPEG parallel IO */ | 567 | cx_write(MO_PINMUX_IO, 0x88); /* 656-8bit IO and enable MPEG parallel IO */ |
571 | cx_clear(MO_INPUT_FORMAT, 0x100); /* chroma subcarrier lock to normal? */ | 568 | cx_clear(MO_INPUT_FORMAT, 0x100); /* chroma subcarrier lock to normal? */ |
@@ -573,7 +570,6 @@ static int blackbird_initialize_codec(struct cx8802_dev *dev) | |||
573 | cx_clear(MO_OUTPUT_FORMAT, 0x0008); /* Normal Y-limits to let the mpeg encoder sync */ | 570 | cx_clear(MO_OUTPUT_FORMAT, 0x0008); /* Normal Y-limits to let the mpeg encoder sync */ |
574 | 571 | ||
575 | blackbird_codec_settings(dev); | 572 | blackbird_codec_settings(dev); |
576 | msleep(1); | ||
577 | 573 | ||
578 | blackbird_api_cmd(dev, CX2341X_ENC_SET_NUM_VSYNC_LINES, 2, 0, | 574 | blackbird_api_cmd(dev, CX2341X_ENC_SET_NUM_VSYNC_LINES, 2, 0, |
579 | BLACKBIRD_FIELD1_SAA7115, | 575 | BLACKBIRD_FIELD1_SAA7115, |
@@ -584,7 +580,6 @@ static int blackbird_initialize_codec(struct cx8802_dev *dev) | |||
584 | BLACKBIRD_CUSTOM_EXTENSION_USR_DATA, | 580 | BLACKBIRD_CUSTOM_EXTENSION_USR_DATA, |
585 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); | 581 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); |
586 | 582 | ||
587 | msleep(1); | ||
588 | return 0; | 583 | return 0; |
589 | } | 584 | } |
590 | 585 | ||
@@ -616,9 +611,7 @@ static int blackbird_start_codec(struct file *file, void *priv) | |||
616 | cx_clear(AUD_VOL_CTL, (1 << 6)); | 611 | cx_clear(AUD_VOL_CTL, (1 << 6)); |
617 | 612 | ||
618 | blackbird_api_cmd(dev, CX2341X_ENC_MUTE_VIDEO, 1, 0, BLACKBIRD_UNMUTE); | 613 | blackbird_api_cmd(dev, CX2341X_ENC_MUTE_VIDEO, 1, 0, BLACKBIRD_UNMUTE); |
619 | msleep(1); | ||
620 | blackbird_api_cmd(dev, CX2341X_ENC_MUTE_AUDIO, 1, 0, BLACKBIRD_UNMUTE); | 614 | blackbird_api_cmd(dev, CX2341X_ENC_MUTE_AUDIO, 1, 0, BLACKBIRD_UNMUTE); |
621 | msleep(1); | ||
622 | 615 | ||
623 | blackbird_api_cmd(dev, CX2341X_ENC_REFRESH_INPUT, 0,0); | 616 | blackbird_api_cmd(dev, CX2341X_ENC_REFRESH_INPUT, 0,0); |
624 | 617 | ||
@@ -630,7 +623,6 @@ static int blackbird_start_codec(struct file *file, void *priv) | |||
630 | BLACKBIRD_MPEG_CAPTURE, | 623 | BLACKBIRD_MPEG_CAPTURE, |
631 | BLACKBIRD_RAW_BITS_NONE | 624 | BLACKBIRD_RAW_BITS_NONE |
632 | ); | 625 | ); |
633 | msleep(10); | ||
634 | 626 | ||
635 | dev->mpeg_active = 1; | 627 | dev->mpeg_active = 1; |
636 | return 0; | 628 | return 0; |