From fde51a8d52ae92eac95d78a40720d06d235ca3df Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Tue, 7 Sep 2010 14:32:34 +0000 Subject: [PATCH] --- yaml --- r: 211709 b: refs/heads/master c: a529f1505b6facfd0078dcb18a444976c1985962 h: refs/heads/master i: 211707: b48fb122adff454efef606cd1a44a4df8311841e v: v3 --- [refs] | 2 +- trunk/drivers/parport/share.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bd8e180fe1a3..4f529482ed74 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db7f859ec53c0bfaf3520afe2feafd18a27e48fb +refs/heads/master: a529f1505b6facfd0078dcb18a444976c1985962 diff --git a/trunk/drivers/parport/share.c b/trunk/drivers/parport/share.c index dffa5d4fb298..a2d9d1e59260 100644 --- a/trunk/drivers/parport/share.c +++ b/trunk/drivers/parport/share.c @@ -306,7 +306,7 @@ struct parport *parport_register_port(unsigned long base, int irq, int dma, spin_lock_init(&tmp->pardevice_lock); tmp->ieee1284.mode = IEEE1284_MODE_COMPAT; tmp->ieee1284.phase = IEEE1284_PH_FWD_IDLE; - init_MUTEX_LOCKED (&tmp->ieee1284.irq); /* actually a semaphore at 0 */ + sema_init(&tmp->ieee1284.irq, 0); tmp->spintime = parport_default_spintime; atomic_set (&tmp->ref_count, 1); INIT_LIST_HEAD(&tmp->full_list);