git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier...
[pandora-kernel.git]
/
drivers
/
macintosh
/
macio-adb.c
diff --git
a/drivers/macintosh/macio-adb.c
b/drivers/macintosh/macio-adb.c
index
79119f5
..
bd6da7a
100644
(file)
--- a/
drivers/macintosh/macio-adb.c
+++ b/
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;
}
}