From fc34d6be000b03550d9c41650e1d34d0f70dea19 Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Mon, 18 May 2009 03:02:32 +0400 Subject: [PATCH] --- yaml --- r: 150395 b: refs/heads/master c: 69712e926bad9c163d5ba5597f08084ee7902480 h: refs/heads/master i: 150393: 92f20d90beef1aea3767e704246f07cb21a7c147 150391: 5530cbd9d7dd2e3ce9379453f09ca202f565b10b v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/p54/p54spi.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 16de0419ba96..639517eae39b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 210dd1bb9b0329bcc1b4f8932022eddc6466980c +refs/heads/master: 69712e926bad9c163d5ba5597f08084ee7902480 diff --git a/trunk/drivers/net/wireless/p54/p54spi.c b/trunk/drivers/net/wireless/p54/p54spi.c index 272b7e176afc..399190b3bed7 100644 --- a/trunk/drivers/net/wireless/p54/p54spi.c +++ b/trunk/drivers/net/wireless/p54/p54spi.c @@ -96,7 +96,7 @@ static void p54spi_spi_write(struct p54s_priv *priv, u8 address, spi_message_add_tail(&t[0], &m); t[1].tx_buf = buf; - t[1].len = len; + t[1].len = len & ~1; spi_message_add_tail(&t[1], &m); if (len % 2) { @@ -541,11 +541,6 @@ static void p54spi_work(struct work_struct *work) } ret = p54spi_wq_tx(priv); - if (ret < 0) - goto out; - - ints = p54spi_read32(priv, SPI_ADRS_HOST_INTERRUPTS); - out: mutex_unlock(&priv->mutex); }