AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

Char: rio, fix sparse warnings

Browse Source 
Add some locks and unlocks to some code paths.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jiri Slaby 2008-04-02 13:04:48 -07:00 committed by Linus Torvalds
parent 3d0ae36ea9
commit 212e7bb6cd
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/char/rio/riotable.c
View File

@ -425,8 +425,10 @@ int RIOApel(struct rio_info *p)
MapP = &p->RIOConnectTable[Next++]; MapP = &p->RIOConnectTable[Next++];
MapP->HostUniqueNum = HostP->UniqueNum; 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; continue;
}
MapP->RtaUniqueNum = 0; MapP->RtaUniqueNum = 0;
MapP->ID = 0; MapP->ID = 0;
MapP->Flags = SLOT_IN_USE; MapP->Flags = SLOT_IN_USE;

4
drivers/char/rio/riotty.c
View File

@ -319,6 +319,7 @@ int riotopen(struct tty_struct *tty, struct file *filp)
PortP->State |= RIO_WOPEN; PortP->State |= RIO_WOPEN;
rio_spin_unlock_irqrestore(&PortP->portSem, flags); rio_spin_unlock_irqrestore(&PortP->portSem, flags);
if (RIODelay(PortP, HUNDRED_MS) == RIO_FAIL) { if (RIODelay(PortP, HUNDRED_MS) == RIO_FAIL) {
rio_spin_lock_irqsave(&PortP->portSem, flags);
/* /*
** ACTION: verify that this is a good thing ** ACTION: verify that this is a good thing
** to do here. -- ??? ** to do here. -- ???
@ -334,6 +335,7 @@ int riotopen(struct tty_struct *tty, struct file *filp)
func_exit(); func_exit();
return -EINTR; return -EINTR;
} }
rio_spin_lock_irqsave(&PortP->portSem, flags);
} }
PortP->State &= ~RIO_WOPEN; PortP->State &= ~RIO_WOPEN;
} }
@ -493,6 +495,7 @@ int riotclose(void *ptr)
if (RIOShortCommand(p, PortP, CLOSE, 1, 0) == RIO_FAIL) { if (RIOShortCommand(p, PortP, CLOSE, 1, 0) == RIO_FAIL) {
RIOPreemptiveCmd(p, PortP, FCLOSE); RIOPreemptiveCmd(p, PortP, FCLOSE);
rio_spin_lock_irqsave(&PortP->portSem, flags);
goto close_end; goto close_end;
} }
@ -508,6 +511,7 @@ int riotclose(void *ptr)
if (p->RIOHalted) { if (p->RIOHalted) {
RIOClearUp(PortP); RIOClearUp(PortP);
rio_spin_lock_irqsave(&PortP->portSem, flags);
goto close_end; goto close_end;
} }
if (RIODelay(PortP, HUNDRED_MS) == RIO_FAIL) { if (RIODelay(PortP, HUNDRED_MS) == RIO_FAIL) {