diff --git a/[refs] b/[refs]
index b6b4bf11ead7..1858700efc9e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0766d20fdb9178b908f0268c16b464c11822c5c2
+refs/heads/master: cbeb4b7ad5346516d2ee726395eb5722b25a0a01
diff --git a/trunk/drivers/parport/share.c b/trunk/drivers/parport/share.c
index a2d9d1e59260..a848e02e6be3 100644
--- a/trunk/drivers/parport/share.c
+++ b/trunk/drivers/parport/share.c
@@ -678,7 +678,7 @@ void parport_unregister_device(struct pardevice *dev)
 
 	/* Make sure we haven't left any pointers around in the wait
 	 * list. */
-	spin_lock (&port->waitlist_lock);
+	spin_lock_irq(&port->waitlist_lock);
 	if (dev->waitprev || dev->waitnext || port->waithead == dev) {
 		if (dev->waitprev)
 			dev->waitprev->waitnext = dev->waitnext;
@@ -689,7 +689,7 @@ void parport_unregister_device(struct pardevice *dev)
 		else
 			port->waittail = dev->waitprev;
 	}
-	spin_unlock (&port->waitlist_lock);
+	spin_unlock_irq(&port->waitlist_lock);
 
 	kfree(dev->state);
 	kfree(dev);