From a18f6293bbe9d51e284384de4eaa4467a608c66b Mon Sep 17 00:00:00 2001
From: "Leonid V. Fedorenchik" <leonidsbox@gmail.com>
Date: Fri, 2 Sep 2011 11:55:42 +0800
Subject: [PATCH] --- yaml --- r: 268336 b: refs/heads/master c:
 cc9518fe1466a8f0a9c761618b236db905d350be h: refs/heads/master v: v3

---
 [refs]                                                     | 2 +-
 trunk/drivers/staging/cx25821/cx25821-video-upstream-ch2.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 7066044988bb..77e2688794a1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9737153bf048a01781b69a7266df1db17e437b42
+refs/heads/master: cc9518fe1466a8f0a9c761618b236db905d350be
diff --git a/trunk/drivers/staging/cx25821/cx25821-video-upstream-ch2.c b/trunk/drivers/staging/cx25821/cx25821-video-upstream-ch2.c
index a6424165bb61..b02dbe004b19 100644
--- a/trunk/drivers/staging/cx25821/cx25821-video-upstream-ch2.c
+++ b/trunk/drivers/staging/cx25821/cx25821-video-upstream-ch2.c
@@ -521,7 +521,7 @@ static int cx25821_upstream_buffer_prepare_ch2(struct cx25821_dev *dev,
 
 	return 0;
 
-	error:
+error:
 	return ret;
 }
 
@@ -720,7 +720,7 @@ int cx25821_start_video_dma_upstream_ch2(struct cx25821_dev *dev,
 
 	return 0;
 
-	fail_irq:
+fail_irq:
 	cx25821_dev_unregister(dev);
 	return err;
 }
@@ -830,7 +830,7 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
 
 	return 0;
 
-	error:
+error:
 	cx25821_dev_unregister(dev);
 
 	return err;