From 91070043e88631eae21584edd7670542ae5e83e8 Mon Sep 17 00:00:00 2001 From: Matthias Kaehlcke Date: Thu, 7 Feb 2008 00:15:24 -0800 Subject: [PATCH] --- yaml --- r: 83845 b: refs/heads/master c: a40ba8495798fa7eae6fa12b16a0d06d906ba47f h: refs/heads/master i: 83843: d5ff4aaef70a29bf3e7894257ae0e5609fc0200c v: v3 --- [refs] | 2 +- trunk/drivers/char/mbcs.c | 7 ++++--- trunk/drivers/char/mbcs.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 09e5112fc3f0..f27a17f16abc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 92df5c3e38c0a0a66a456926039548275dfb3328 +refs/heads/master: a40ba8495798fa7eae6fa12b16a0d06d906ba47f diff --git a/trunk/drivers/char/mbcs.c b/trunk/drivers/char/mbcs.c index 3c5802ae1716..035575c041cd 100644 --- a/trunk/drivers/char/mbcs.c +++ b/trunk/drivers/char/mbcs.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -281,7 +282,7 @@ static inline int mbcs_algo_start(struct mbcs_soft *soft) void *mmr_base = soft->mmr_base; union cm_control cm_control; - if (down_interruptible(&soft->algolock)) + if (mutex_lock_interruptible(&soft->algolock)) return -ERESTARTSYS; atomic_set(&soft->algo_done, 0); @@ -298,7 +299,7 @@ static inline int mbcs_algo_start(struct mbcs_soft *soft) cm_control.alg_go = 1; MBCS_MMR_SET(mmr_base, MBCS_CM_CONTROL, cm_control.cm_control_reg); - up(&soft->algolock); + mutex_unlock(&soft->algolock); return 0; } @@ -764,7 +765,7 @@ static int mbcs_probe(struct cx_dev *dev, const struct cx_device_id *id) init_MUTEX(&soft->dmawritelock); init_MUTEX(&soft->dmareadlock); - init_MUTEX(&soft->algolock); + mutex_init(&soft->algolock); mbcs_getdma_init(&soft->getdma); mbcs_putdma_init(&soft->putdma); diff --git a/trunk/drivers/char/mbcs.h b/trunk/drivers/char/mbcs.h index c9905a3c3353..d4d97abbce7f 100644 --- a/trunk/drivers/char/mbcs.h +++ b/trunk/drivers/char/mbcs.h @@ -539,7 +539,7 @@ struct mbcs_soft { atomic_t algo_done; struct semaphore dmawritelock; struct semaphore dmareadlock; - struct semaphore algolock; + struct mutex algolock; }; static int mbcs_open(struct inode *ip, struct file *fp);