Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 212e7bb6 authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds
Browse files

Char: rio, fix sparse warnings 



Add some locks and unlocks to some code paths.

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3d0ae36e

drivers/char/rio/riotable.c

+3 −1
Original line number Diff line number Diff line
@@ -425,8 +425,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;

drivers/char/rio/riotty.c

+4 −0
Original line number Diff line number Diff line
@@ -319,6 +319,7 @@ int riotopen(struct tty_struct *tty, struct file *filp) 
			PortP->State |= RIO_WOPEN;

			rio_spin_unlock_irqrestore(&PortP->portSem, flags);

			if (RIODelay(PortP, HUNDRED_MS) == RIO_FAIL) {

				rio_spin_lock_irqsave(&PortP->portSem, flags);

				/*

				 ** ACTION: verify that this is a good thing

				 ** to do here. -- ???
@@ -334,6 +335,7 @@ int riotopen(struct tty_struct *tty, struct file *filp) 
				func_exit();

				return -EINTR;

			}

			rio_spin_lock_irqsave(&PortP->portSem, flags);

		}

		PortP->State &= ~RIO_WOPEN;

	}
@@ -493,6 +495,7 @@ int riotclose(void *ptr) 


	if (RIOShortCommand(p, PortP, CLOSE, 1, 0) == RIO_FAIL) {

		RIOPreemptiveCmd(p, PortP, FCLOSE);

		rio_spin_lock_irqsave(&PortP->portSem, flags);

		goto close_end;

	}
@@ -508,6 +511,7 @@ int riotclose(void *ptr) 


			if (p->RIOHalted) {

				RIOClearUp(PortP);

				rio_spin_lock_irqsave(&PortP->portSem, flags);

				goto close_end;

			}

			if (RIODelay(PortP, HUNDRED_MS) == RIO_FAIL) {