Merge branch 'linus' into x86/urgent

[linux-2.6-omap-h63xx.git] / drivers / char / rio / riotable.c

diff --git a/drivers/char/rio/riotable.c b/drivers/char/rio/riotable.c
index 991119c9f473ef81a8f8691be7860b52af3bd38d..3d15802dc0f3eb066c094b1c3c34d9e78fa97c49 100644 (file)
--- a/drivers/char/rio/riotable.c
+++ b/drivers/char/rio/riotable.c
@@ -29,9 +29,6 @@
 **
 ** -----------------------------------------------------------------------------
 */
-#ifdef SCCS_LABELS
-static char *_riotable_c_sccs_ = "@(#)riotable.c       1.2";
-#endif
 
 #include <linux/module.h>
 #include <linux/slab.h>
@@ -42,7 +39,6 @@ static char *_riotable_c_sccs_ = "@(#)riotable.c      1.2";
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/string.h>
-#include <asm/semaphore.h>
 #include <asm/uaccess.h>
 
 #include <linux/termios.h>
@@ -425,8 +421,10 @@ int RIOApel(struct rio_info *p)
 
                MapP = &p->RIOConnectTable[Next++];
                MapP->HostUniqueNum = HostP->UniqueNum;
-               if ((HostP->Flags & RUN_STATE) != RC_RUNNING)
+               if ((HostP->Flags & RUN_STATE) != RC_RUNNING) {
+                       rio_spin_unlock_irqrestore(&HostP->HostLock, flags);
                        continue;
+               }
                MapP->RtaUniqueNum = 0;
                MapP->ID = 0;
                MapP->Flags = SLOT_IN_USE;