From 814b0d6ef73496f89977a67edf1ed58d15ae7a3c Mon Sep 17 00:00:00 2001
From: Ian Armstrong <ian@iarmst.demon.co.uk>
Date: Sat, 21 Jun 2008 11:09:46 -0300
Subject: [PATCH] --- yaml --- r: 103852 b: refs/heads/master c:
 42b03fe16fe8cc2cd6575e25ed1872fd6f5da56f h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/media/video/ivtv/ivtv-ioctl.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f3c2eafd9fd8..5d8e7b855dff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03c2808503b102971226007070c57410267d0b9d
+refs/heads/master: 42b03fe16fe8cc2cd6575e25ed1872fd6f5da56f
diff --git a/trunk/drivers/media/video/ivtv/ivtv-ioctl.c b/trunk/drivers/media/video/ivtv/ivtv-ioctl.c
index b1cda6cd5582..aa222056dd47 100644
--- a/trunk/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/trunk/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -1539,7 +1539,7 @@ static int ivtv_decoder_ioctls(struct file *filp, unsigned int cmd, void *arg)
 			return -EINVAL;
 		if (itv->output_mode == OUT_UDMA_YUV && args->y_source == NULL)
 			return 0;
-		if (ivtv_claim_stream(id, id->type)) {
+		if (ivtv_start_decoding(id, id->type)) {
 			return -EBUSY;
 		}
 		if (ivtv_set_output_mode(itv, OUT_UDMA_YUV) != OUT_UDMA_YUV) {