Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 247440
b: refs/heads/master
c: 424f73b
h: refs/heads/master
v: v3
  • Loading branch information
Heiko Carstens authored and David S. Miller committed May 13, 2011
1 parent 5503941 commit 4c34b47
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 38ed18ff5ed170a68f334c2362735c1268cec81b
refs/heads/master: 424f73b3ecc41367336ce75cc489c1e373c421fc
10 changes: 3 additions & 7 deletions trunk/drivers/s390/net/lcs.c
Original file line number Diff line number Diff line change
Expand Up @@ -1483,7 +1483,6 @@ lcs_tasklet(unsigned long data)
struct lcs_channel *channel;
struct lcs_buffer *iob;
int buf_idx;
int rc;

channel = (struct lcs_channel *) data;
LCS_DBF_TEXT_(5, trace, "tlet%s", dev_name(&channel->ccwdev->dev));
Expand All @@ -1500,14 +1499,11 @@ lcs_tasklet(unsigned long data)
channel->buf_idx = buf_idx;

if (channel->state == LCS_CH_STATE_STOPPED)
// FIXME: what if rc != 0 ??
rc = lcs_start_channel(channel);
lcs_start_channel(channel);
spin_lock_irqsave(get_ccwdev_lock(channel->ccwdev), flags);
if (channel->state == LCS_CH_STATE_SUSPENDED &&
channel->iob[channel->io_idx].state == LCS_BUF_STATE_READY) {
// FIXME: what if rc != 0 ??
rc = __lcs_resume_channel(channel);
}
channel->iob[channel->io_idx].state == LCS_BUF_STATE_READY)
__lcs_resume_channel(channel);
spin_unlock_irqrestore(get_ccwdev_lock(channel->ccwdev), flags);

/* Something happened on the channel. Wake up waiters. */
Expand Down

0 comments on commit 4c34b47

Please sign in to comment.