From 2060e27641539d40e7949b1b2078b330817cecf8 Mon Sep 17 00:00:00 2001 From: Jelle Foks Date: Mon, 21 May 2007 14:46:06 -0300 Subject: [PATCH] --- yaml --- r: 76591 b: refs/heads/master c: e21a5c68deab7cd300e8502488f844f77e0f26d0 h: refs/heads/master i: 76589: f81523096b74287962a5b30c59064e4ebe412fb5 76587: 3d582875b23fe2efb82c5ecc1daa992a8a93f895 76583: 336f937d396217869a80fea4a675bcc9299e87c7 76575: 7aca00f76d83d3ef27eb76daebdd79fe580db944 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx88/cx88-blackbird.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 448d238d7d9a..9ea4363b7a5b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f9e54e0c84da869ad9bc372fb4eab26d558dbfc2 +refs/heads/master: e21a5c68deab7cd300e8502488f844f77e0f26d0 diff --git a/trunk/drivers/media/video/cx88/cx88-blackbird.c b/trunk/drivers/media/video/cx88/cx88-blackbird.c index 7ce37f46b753..4a0e1f8992cd 100644 --- a/trunk/drivers/media/video/cx88/cx88-blackbird.c +++ b/trunk/drivers/media/video/cx88/cx88-blackbird.c @@ -541,9 +541,7 @@ static int blackbird_initialize_codec(struct cx8802_dev *dev) /* ping was not successful, reset and upload firmware */ cx_write(MO_SRST_IO, 0); /* SYS_RSTO=0 */ - msleep(1); cx_write(MO_SRST_IO, 1); /* SYS_RSTO=1 */ - msleep(1); retval = blackbird_load_firmware(dev); if (retval < 0) return retval; @@ -565,7 +563,6 @@ static int blackbird_initialize_codec(struct cx8802_dev *dev) } dprintk(0, "Firmware version is 0x%08x\n", version); } - msleep(1); cx_write(MO_PINMUX_IO, 0x88); /* 656-8bit IO and enable MPEG parallel IO */ cx_clear(MO_INPUT_FORMAT, 0x100); /* chroma subcarrier lock to normal? */ @@ -573,7 +570,6 @@ static int blackbird_initialize_codec(struct cx8802_dev *dev) cx_clear(MO_OUTPUT_FORMAT, 0x0008); /* Normal Y-limits to let the mpeg encoder sync */ blackbird_codec_settings(dev); - msleep(1); blackbird_api_cmd(dev, CX2341X_ENC_SET_NUM_VSYNC_LINES, 2, 0, BLACKBIRD_FIELD1_SAA7115, @@ -584,7 +580,6 @@ static int blackbird_initialize_codec(struct cx8802_dev *dev) BLACKBIRD_CUSTOM_EXTENSION_USR_DATA, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - msleep(1); return 0; } @@ -616,9 +611,7 @@ static int blackbird_start_codec(struct file *file, void *priv) cx_clear(AUD_VOL_CTL, (1 << 6)); blackbird_api_cmd(dev, CX2341X_ENC_MUTE_VIDEO, 1, 0, BLACKBIRD_UNMUTE); - msleep(1); blackbird_api_cmd(dev, CX2341X_ENC_MUTE_AUDIO, 1, 0, BLACKBIRD_UNMUTE); - msleep(1); blackbird_api_cmd(dev, CX2341X_ENC_REFRESH_INPUT, 0,0); @@ -630,7 +623,6 @@ static int blackbird_start_codec(struct file *file, void *priv) BLACKBIRD_MPEG_CAPTURE, BLACKBIRD_RAW_BITS_NONE ); - msleep(10); dev->mpeg_active = 1; return 0;