diff --git a/[refs] b/[refs] index cc36ada115f4..a81bc71867a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b27d45bb50498c86aa87e7ef174b2a0f5b6f361 +refs/heads/master: 6a0bc9a0162d10c551bb916a1a21bfede4db3203 diff --git a/trunk/drivers/media/video/cx88/cx88-blackbird.c b/trunk/drivers/media/video/cx88/cx88-blackbird.c index 165c0fdd3d13..d83facf00dc6 100644 --- a/trunk/drivers/media/video/cx88/cx88-blackbird.c +++ b/trunk/drivers/media/video/cx88/cx88-blackbird.c @@ -627,15 +627,11 @@ static int blackbird_start_codec(struct file *file, void *priv) static int blackbird_stop_codec(struct cx8802_dev *dev) { - struct cx88_core *core = dev->core; - blackbird_api_cmd(dev, CX2341X_ENC_STOP_CAPTURE, 3, 0, BLACKBIRD_END_NOW, BLACKBIRD_MPEG_CAPTURE, BLACKBIRD_RAW_BITS_NONE ); - /* mute audio source */ - cx_set(AUD_VOL_CTL, (1 << 6)); dev->mpeg_active = 0; return 0;