Skip to content

Commit

Permalink
Char: ip2, fix sparse warnings
Browse files Browse the repository at this point in the history
Unlock two grabbed locks on some 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>
  • Loading branch information
Jiri Slaby authored and Linus Torvalds committed Apr 2, 2008
1 parent ffc41cf commit 3d0ae36
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions drivers/char/ip2/i2lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -644,12 +644,12 @@ i2QueueCommands(int type, i2ChanStrPtr pCh, int timeout, int nCommands,
// Normal Expected path - We still hold LOCK
break; /* from for()- Enough room: goto proceed */
}
}

ip2trace (CHANN, ITRC_QUEUE, 3, 1, totalsize );
ip2trace(CHANN, ITRC_QUEUE, 3, 1, totalsize);
WRITE_UNLOCK_IRQRESTORE(lock_var_p, flags);
} else
ip2trace(CHANN, ITRC_QUEUE, 3, 1, totalsize);

// Prepare to wait for buffers to empty
WRITE_UNLOCK_IRQRESTORE(lock_var_p,flags);
/* Prepare to wait for buffers to empty */
serviceOutgoingFifo(pB); // Dump what we got

if (timeout == 0) {
Expand Down Expand Up @@ -1830,6 +1830,8 @@ i2StripFifo(i2eBordStrPtr pB)
default: // Neither packet? should be impossible
ip2trace (ITRC_NO_PORT, ITRC_SFIFO, 5, 1,
PTYPE_OF(pB->i2eLeadoffWord) );
WRITE_UNLOCK_IRQRESTORE(&pB->read_fifo_spinlock,
bflags);

break;
} // End of switch on type of packets
Expand Down

0 comments on commit 3d0ae36

Please sign in to comment.