diff --git a/[refs] b/[refs] index 32ec8a99cc97..2e8dc0f0305d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e6373c4c0ecb3a944c34117a3daeac315d641b5f +refs/heads/master: d1d182e00d72300e05b18e28372fab003d8d4a58 diff --git a/trunk/drivers/net/wimax/i2400m/usb-tx.c b/trunk/drivers/net/wimax/i2400m/usb-tx.c index ac357acfb3e9..99ef81b3d5a5 100644 --- a/trunk/drivers/net/wimax/i2400m/usb-tx.c +++ b/trunk/drivers/net/wimax/i2400m/usb-tx.c @@ -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; @@ -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; }