From 34a8fad6d6157003e775880e4ac45a42e8d24fd5 Mon Sep 17 00:00:00 2001
From: Matthias Kaehlcke <matthias.kaehlcke@gmail.com>
Date: Thu, 7 Feb 2008 00:15:25 -0800
Subject: [PATCH] --- yaml --- r: 83847 b: refs/heads/master c:
 ae5e29798afa2b11a01fcb4fab8b58fee47fe155 h: refs/heads/master i:   83845:
 91070043e88631eae21584edd7670542ae5e83e8   83843:
 d5ff4aaef70a29bf3e7894257ae0e5609fc0200c   83839:
 36a26dfa16e5d349d5dc0728e8a42597a7d95f34 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/char/mbcs.c | 6 +++---
 trunk/drivers/char/mbcs.h | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 23ad7e0d10b6..2d02e1d1b68b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46bca69682731104b42f99da763b9a08a0574291
+refs/heads/master: ae5e29798afa2b11a01fcb4fab8b58fee47fe155
diff --git a/trunk/drivers/char/mbcs.c b/trunk/drivers/char/mbcs.c
index 7321c14868af..f4716ad7348a 100644
--- a/trunk/drivers/char/mbcs.c
+++ b/trunk/drivers/char/mbcs.c
@@ -347,7 +347,7 @@ do_mbcs_sram_dmaread(struct mbcs_soft *soft, uint64_t hostAddr,
 {
 	int rv = 0;
 
-	if (down_interruptible(&soft->dmareadlock))
+	if (mutex_lock_interruptible(&soft->dmareadlock))
 		return -ERESTARTSYS;
 
 	atomic_set(&soft->dmawrite_done, 0);
@@ -372,7 +372,7 @@ do_mbcs_sram_dmaread(struct mbcs_soft *soft, uint64_t hostAddr,
 	*off += len;
 
 dmaread_exit:
-	up(&soft->dmareadlock);
+	mutex_unlock(&soft->dmareadlock);
 
 	return rv;
 }
@@ -764,7 +764,7 @@ static int mbcs_probe(struct cx_dev *dev, const struct cx_device_id *id)
 	init_waitqueue_head(&soft->algo_queue);
 
 	mutex_init(&soft->dmawritelock);
-	init_MUTEX(&soft->dmareadlock);
+	mutex_init(&soft->dmareadlock);
 	mutex_init(&soft->algolock);
 
 	mbcs_getdma_init(&soft->getdma);
diff --git a/trunk/drivers/char/mbcs.h b/trunk/drivers/char/mbcs.h
index b05435145d72..ba671589f4cb 100644
--- a/trunk/drivers/char/mbcs.h
+++ b/trunk/drivers/char/mbcs.h
@@ -538,7 +538,7 @@ struct mbcs_soft {
 	atomic_t dmaread_done;
 	atomic_t algo_done;
 	struct mutex dmawritelock;
-	struct semaphore dmareadlock;
+	struct mutex dmareadlock;
 	struct mutex algolock;
 };