---

yaml --- r: 211709 b: refs/heads/master c: a529f15 h: refs/heads/master i: 211707: b48fb12 v: v3
git-mirror · Oct 12, 2010 · fde51a8 · fde51a8
1 parent 8b4951f
commit fde51a8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);