From 825e42566d02e3f31bebf65a7fc19b4db49c56ad Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 7 Oct 2008 07:54:34 -0700
Subject: [PATCH] --- yaml --- r: 110224 b: refs/heads/master c:
 e09e6e2b6a5daf653794926ab50a784b14b6de53 h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/video/cx88/cx88-blackbird.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8ff4e9bd7414..acae6dcf24d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4330ed8ed4da360ac1ca14b0fddff4c05b10de16
+refs/heads/master: e09e6e2b6a5daf653794926ab50a784b14b6de53
diff --git a/trunk/drivers/media/video/cx88/cx88-blackbird.c b/trunk/drivers/media/video/cx88/cx88-blackbird.c
index 6b922066a660..9a1374a38ec7 100644
--- a/trunk/drivers/media/video/cx88/cx88-blackbird.c
+++ b/trunk/drivers/media/video/cx88/cx88-blackbird.c
@@ -1070,7 +1070,6 @@ static int mpeg_open(struct inode *inode, struct file *file)
 		err = drv->request_acquire(drv);
 		if(err != 0) {
 			dprintk(1,"%s: Unable to acquire hardware, %d\n", __func__, err);
-			unlock_kernel();
 			return err;
 		}
 	}