diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 12:23:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 12:23:49 -0800 |
| commit | bf785ee0aeea7a3e717cb1e11df4135b6cbde7da (patch) | |
| tree | 32ae52ad51c2a3952f2e1a2af9217717954fa593 /arch/arm/kernel/ecard.c | |
| parent | 8b87e1baff24e586c3fe6c168843d213119bf4dd (diff) | |
| parent | 00431707be0cc1236ee08459367872b57da5be29 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/kernel/ecard.c')
| -rw-r--r-- | arch/arm/kernel/ecard.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c index dceb826bd21..96fd91926c9 100644 --- a/arch/arm/kernel/ecard.c +++ b/arch/arm/kernel/ecard.c @@ -40,6 +40,7 @@ #include <linux/proc_fs.h> #include <linux/device.h> #include <linux/init.h> +#include <linux/mutex.h> #include <asm/dma.h> #include <asm/ecard.h> @@ -206,7 +207,7 @@ static void ecard_task_readbytes(struct ecard_request *req) static DECLARE_WAIT_QUEUE_HEAD(ecard_wait); static struct ecard_request *ecard_req; -static DECLARE_MUTEX(ecard_sem); +static DEFINE_MUTEX(ecard_mutex); /* * Set up the expansion card daemon's page tables. @@ -299,7 +300,7 @@ static void ecard_call(struct ecard_request *req) req->complete = &completion; - down(&ecard_sem); + mutex_lock(&ecard_mutex); ecard_req = req; wake_up(&ecard_wait); @@ -307,7 +308,7 @@ static void ecard_call(struct ecard_request *req) * Now wait for kecardd to run. */ wait_for_completion(&completion); - up(&ecard_sem); + mutex_unlock(&ecard_mutex); } /* ======================= Mid-level card control ===================== */ |