From 5743d26d2458468a810d3ed77a17edf5e4c38a31 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Mon, 29 Mar 2010 05:34:46 +0000
Subject: [PATCH] --- yaml --- r: 196603 b: refs/heads/master c:
 86e4754ac8fde9a9c913571016bc31257aa2e195 h: refs/heads/master i:   196601:
 5a996ac6737af9f59a12b10ebcc935f782573f0c   196599:
 1850b604c662271c495ad23b276954e20f465b69 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/macintosh/macio-adb.c | 1 +
 trunk/drivers/macintosh/smu.c       | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fea28872d5ee..0b67acd1a11e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6d8c8bb1d360272d795927d39f3d2c5934e77d9
+refs/heads/master: 86e4754ac8fde9a9c913571016bc31257aa2e195
diff --git a/trunk/drivers/macintosh/macio-adb.c b/trunk/drivers/macintosh/macio-adb.c
index 79119f56e82d..bd6da7a9c55b 100644
--- a/trunk/drivers/macintosh/macio-adb.c
+++ b/trunk/drivers/macintosh/macio-adb.c
@@ -155,6 +155,7 @@ static int macio_adb_reset_bus(void)
 	while ((in_8(&adb->ctrl.r) & ADB_RST) != 0) {
 		if (--timeout == 0) {
 			out_8(&adb->ctrl.r, in_8(&adb->ctrl.r) & ~ADB_RST);
+			spin_unlock_irqrestore(&macio_lock, flags);
 			return -1;
 		}
 	}
diff --git a/trunk/drivers/macintosh/smu.c b/trunk/drivers/macintosh/smu.c
index 888448cf7f1f..c9da5c4c167d 100644
--- a/trunk/drivers/macintosh/smu.c
+++ b/trunk/drivers/macintosh/smu.c
@@ -1183,8 +1183,10 @@ static ssize_t smu_read_command(struct file *file, struct smu_private *pp,
 		return -EOVERFLOW;
 	spin_lock_irqsave(&pp->lock, flags);
 	if (pp->cmd.status == 1) {
-		if (file->f_flags & O_NONBLOCK)
+		if (file->f_flags & O_NONBLOCK) {
+			spin_unlock_irqrestore(&pp->lock, flags);
 			return -EAGAIN;
+		}
 		add_wait_queue(&pp->wait, &wait);
 		for (;;) {
 			set_current_state(TASK_INTERRUPTIBLE);