From d7c5407aac5cee48517936f58056516c7d8b9a60 Mon Sep 17 00:00:00 2001
From: Ben Nizette <bn@niasdigital.com>
Date: Fri, 18 Jul 2008 16:48:09 +1000
Subject: [PATCH] --- yaml --- r: 106543 b: refs/heads/master c:
 fbfca4b8781757c1950b2225ba67d83072e0bc07 h: refs/heads/master i:   106541:
 2efbd033b6ad21f1a8b7ee9815f0c5981284ea9b   106539:
 be7ab80f87e424bc52756a71327e6b20b85a5708   106535:
 f32c1bdaae4403434e62820cec93622e9048c68f   106527:
 36879381edec7915c818b63b7a69864daf731a6e v: v3

---
 [refs]                                    |  2 +-
 trunk/arch/avr32/mach-at32ap/at32ap700x.c | 13 ++++++-------
 trunk/drivers/mmc/host/atmel-mci.c        |  1 +
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index f53563853db6..227b303cc08b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62fe8378d949c9a12bc2a5f51cd41fabf70e682c
+refs/heads/master: fbfca4b8781757c1950b2225ba67d83072e0bc07
diff --git a/trunk/arch/avr32/mach-at32ap/at32ap700x.c b/trunk/arch/avr32/mach-at32ap/at32ap700x.c
index 021d51217184..4ac38d28891d 100644
--- a/trunk/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/trunk/arch/avr32/mach-at32ap/at32ap700x.c
@@ -1284,7 +1284,6 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
 {
 	struct mci_platform_data	_data;
 	struct platform_device		*pdev;
-	struct dw_dma_slave		*dws;
 
 	if (id != 0)
 		return NULL;
@@ -1300,6 +1299,8 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
 	if (!data) {
 		data = &_data;
 		memset(data, 0, sizeof(struct mci_platform_data));
+		data->detect_pin = GPIO_PIN_NONE;
+		data->wp_pin = GPIO_PIN_NONE;
 	}
 
 	if (platform_device_add_data(pdev, data,
@@ -1313,12 +1314,10 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
 	select_peripheral(PA(14), PERIPH_A, 0);	/* DATA2 */
 	select_peripheral(PA(15), PERIPH_A, 0);	/* DATA3 */
 
-	if (data) {
-		if (data->detect_pin != GPIO_PIN_NONE)
-			at32_select_gpio(data->detect_pin, 0);
-		if (data->wp_pin != GPIO_PIN_NONE)
-			at32_select_gpio(data->wp_pin, 0);
-	}
+	if (data->detect_pin != GPIO_PIN_NONE)
+		at32_select_gpio(data->detect_pin, 0);
+	if (data->wp_pin != GPIO_PIN_NONE)
+		at32_select_gpio(data->wp_pin, 0);
 
 	atmel_mci0_pclk.dev = &pdev->dev;
 
diff --git a/trunk/drivers/mmc/host/atmel-mci.c b/trunk/drivers/mmc/host/atmel-mci.c
index cce873c5a149..c2f8aa840e82 100644
--- a/trunk/drivers/mmc/host/atmel-mci.c
+++ b/trunk/drivers/mmc/host/atmel-mci.c
@@ -10,6 +10,7 @@
 #include <linux/blkdev.h>
 #include <linux/clk.h>
 #include <linux/device.h>
+#include <linux/err.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>