diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-19 12:17:29 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 12:17:29 -0400 |
| commit | adf6d34e460387ee3e8f1e1875d52bff51212c7d (patch) | |
| tree | 88ef100143e6184103a608f82dfd232bf6376eaf /drivers/char/ip2/i2lib.c | |
| parent | d1964dab60ce7c104dd21590e987a8787db18051 (diff) | |
| parent | 3760d31f11bfbd0ead9eaeb8573e0602437a9d7c (diff) | |
Merge branch 'omap2-upstream' into devel
Diffstat (limited to 'drivers/char/ip2/i2lib.c')
| -rw-r--r-- | drivers/char/ip2/i2lib.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/char/ip2/i2lib.c b/drivers/char/ip2/i2lib.c index d6567b32fb5c..9c25320121ef 100644 --- a/drivers/char/ip2/i2lib.c +++ b/drivers/char/ip2/i2lib.c | |||
| @@ -644,12 +644,12 @@ i2QueueCommands(int type, i2ChanStrPtr pCh, int timeout, int nCommands, | |||
| 644 | // Normal Expected path - We still hold LOCK | 644 | // Normal Expected path - We still hold LOCK |
| 645 | break; /* from for()- Enough room: goto proceed */ | 645 | break; /* from for()- Enough room: goto proceed */ |
| 646 | } | 646 | } |
| 647 | } | 647 | ip2trace(CHANN, ITRC_QUEUE, 3, 1, totalsize); |
| 648 | 648 | WRITE_UNLOCK_IRQRESTORE(lock_var_p, flags); | |
| 649 | ip2trace (CHANN, ITRC_QUEUE, 3, 1, totalsize ); | 649 | } else |
| 650 | ip2trace(CHANN, ITRC_QUEUE, 3, 1, totalsize); | ||
| 650 | 651 | ||
| 651 | // Prepare to wait for buffers to empty | 652 | /* Prepare to wait for buffers to empty */ |
| 652 | WRITE_UNLOCK_IRQRESTORE(lock_var_p,flags); | ||
| 653 | serviceOutgoingFifo(pB); // Dump what we got | 653 | serviceOutgoingFifo(pB); // Dump what we got |
| 654 | 654 | ||
| 655 | if (timeout == 0) { | 655 | if (timeout == 0) { |
| @@ -1830,6 +1830,8 @@ i2StripFifo(i2eBordStrPtr pB) | |||
| 1830 | default: // Neither packet? should be impossible | 1830 | default: // Neither packet? should be impossible |
| 1831 | ip2trace (ITRC_NO_PORT, ITRC_SFIFO, 5, 1, | 1831 | ip2trace (ITRC_NO_PORT, ITRC_SFIFO, 5, 1, |
| 1832 | PTYPE_OF(pB->i2eLeadoffWord) ); | 1832 | PTYPE_OF(pB->i2eLeadoffWord) ); |
| 1833 | WRITE_UNLOCK_IRQRESTORE(&pB->read_fifo_spinlock, | ||
| 1834 | bflags); | ||
| 1833 | 1835 | ||
| 1834 | break; | 1836 | break; |
| 1835 | } // End of switch on type of packets | 1837 | } // End of switch on type of packets |