From 7480f626a4b0bbafcfd09601d84fe261c17672f4 Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Mon, 18 May 2009 03:02:34 +0400 Subject: [PATCH] --- yaml --- r: 150397 b: refs/heads/master c: 6edf534a3214e8fad943d7acd903603f0a5b9ac8 h: refs/heads/master i: 150395: fc34d6be000b03550d9c41650e1d34d0f70dea19 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/p54/p54spi.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b730cb7b3166..8dd62c5f8f0c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 465b63537f93e82a2606332830801acb64467ec9 +refs/heads/master: 6edf534a3214e8fad943d7acd903603f0a5b9ac8 diff --git a/trunk/drivers/net/wireless/p54/p54spi.c b/trunk/drivers/net/wireless/p54/p54spi.c index 5038e8aa9353..e830a2e68450 100644 --- a/trunk/drivers/net/wireless/p54/p54spi.c +++ b/trunk/drivers/net/wireless/p54/p54spi.c @@ -434,16 +434,16 @@ static int p54spi_tx_frame(struct p54s_priv *priv, struct sk_buff *skb) if (!p54spi_wait_bit(priv, SPI_ADRS_HOST_INTERRUPTS, cpu_to_le32(SPI_HOST_INT_WR_READY))) { dev_err(&priv->spi->dev, "WR_READY timeout\n"); - ret = -1; + ret = -EAGAIN; goto out; } p54spi_int_ack(priv, SPI_HOST_INT_WR_READY); - p54spi_sleep(priv); if (FREE_AFTER_TX(skb)) p54_free_skb(priv->hw, skb); out: + p54spi_sleep(priv); return ret; }