Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 278833
b: refs/heads/master
c: d1d182e
h: refs/heads/master
i:
  278831: d20cbe9
v: v3
  • Loading branch information
Dan Carpenter authored and David S. Miller committed Dec 16, 2011
1 parent 2c1aa91 commit ac28992
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 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: e6373c4c0ecb3a944c34117a3daeac315d641b5f
refs/heads/master: d1d182e00d72300e05b18e28372fab003d8d4a58
7 changes: 2 additions & 5 deletions trunk/drivers/net/wimax/i2400m/usb-tx.c
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ int i2400mu_tx(struct i2400mu *i2400mu, struct i2400m_msg_hdr *tx_msg,
static
int i2400mu_txd(void *_i2400mu)
{
int result = 0;
struct i2400mu *i2400mu = _i2400mu;
struct i2400m *i2400m = &i2400mu->i2400m;
struct device *dev = &i2400mu->usb_iface->dev;
Expand Down Expand Up @@ -208,16 +207,14 @@ int i2400mu_txd(void *_i2400mu)
/* Yeah, we ignore errors ... not much we can do */
i2400mu_tx(i2400mu, tx_msg, tx_msg_size);
i2400m_tx_msg_sent(i2400m); /* ack it, advance the FIFO */
if (result < 0)
break;
}

spin_lock_irqsave(&i2400m->tx_lock, flags);
i2400mu->tx_kthread = NULL;
spin_unlock_irqrestore(&i2400m->tx_lock, flags);

d_fnend(4, dev, "(i2400mu %p) = %d\n", i2400mu, result);
return result;
d_fnend(4, dev, "(i2400mu %p)\n", i2400mu);
return 0;
}


Expand Down

0 comments on commit ac28992

Please sign in to comment.