[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-88-gcd52851

[Fabien M <fa...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  cd52851f5f80eb7968f2b3051ac535b93bbe22a1 (commit)
      from  d09891e4890590f8edd24b502cf73c2613d063d2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit cd52851f5f80eb7968f2b3051ac535b93bbe22a1
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Jan 5 18:38:49 2010 +0100

    [LINUX] Patch 349 fixed

-----------------------------------------------------------------------

Summary of changes:
 .../349-armadeus-spi-backport_2.6.32.2.patch       |   48 --------------------
 1 files changed, 0 insertions(+), 48 deletions(-)

diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/349-armadeus-spi-backport_2.6.32.2.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/349-armadeus-spi-backport_2.6.32.2.patch
index 8feff61..9a7b33a 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/349-armadeus-spi-backport_2.6.32.2.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/349-armadeus-spi-backport_2.6.32.2.patch
@@ -315,54 +315,6 @@ Index: linux-2.6.29.6/drivers/spi/spi.c
   * Context: can sleep
   *
   * This performs a half duplex MicroWire style transaction with the
-@@ -658,7 +805,7 @@
- 
- 	int			status;
- 	struct spi_message	message;
--	struct spi_transfer	x;
-+	struct spi_transfer	x[2];
- 	u8			*local_buf;
- 
- 	/* Use preallocated DMA-safe buffer.  We can't avoid copying here,
-@@ -669,9 +816,15 @@
- 		return -EINVAL;
- 
- 	spi_message_init(&message);
--	memset(&x, 0, sizeof x);
--	x.len = n_tx + n_rx;
--	spi_message_add_tail(&x, &message);
-+	memset(x, 0, sizeof x);
-+	if (n_tx) {
-+		x[0].len = n_tx;
-+		spi_message_add_tail(&x[0], &message);
-+	}
-+	if (n_rx) {
-+		x[1].len = n_rx;
-+		spi_message_add_tail(&x[1], &message);
-+	}
- 
- 	/* ... unless someone else is using the pre-allocated buffer */
- 	if (!mutex_trylock(&lock)) {
-@@ -682,15 +835,15 @@
- 		local_buf = buf;
- 
- 	memcpy(local_buf, txbuf, n_tx);
--	x.tx_buf = local_buf;
--	x.rx_buf = local_buf;
-+	x[0].tx_buf = local_buf;
-+	x[1].rx_buf = local_buf + n_tx;
- 
- 	/* do the i/o */
- 	status = spi_sync(spi, &message);
- 	if (status == 0)
--		memcpy(rxbuf, x.rx_buf + n_tx, n_rx);
-+		memcpy(rxbuf, x[1].rx_buf, n_rx);
- 
--	if (x.tx_buf == buf)
-+	if (x[0].tx_buf == buf)
- 		mutex_unlock(&lock);
- 	else
- 		kfree(local_buf);
 Index: linux-2.6.29.6/drivers/spi/spi_gpio.c
 ===================================================================
 --- linux-2.6.29.6.orig/drivers/spi/spi_gpio.c	2010-01-05 15:45:06.000000000 +0100


hooks/post-receive
-- 
armadeus