---

yaml --- r: 311101 b: refs/heads/master c: f433809 h: refs/heads/master i: 311099: 4ec38c5 v: v3
git-mirror · Jun 17, 2012 · eeed64d · eeed64d
1 parent db984df
commit eeed64d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 667d1b48bcb66b89776ebefbaf05b358bc5907ce
+refs/heads/master: f43380981716c9b48bf2809e4cd1cb0c6b71429d
diff --git a/trunk/drivers/mmc/host/mmci.c b/trunk/drivers/mmc/host/mmci.c
@@ -1216,12 +1216,7 @@ static void mmci_dt_populate_generic_pdata(struct device_node *np,
 	int bus_width = 0;
 
 	pdata->gpio_wp = of_get_named_gpio(np, "wp-gpios", 0);
-	if (!pdata->gpio_wp)
-		pdata->gpio_wp = -1;
-
 	pdata->gpio_cd = of_get_named_gpio(np, "cd-gpios", 0);
-	if (!pdata->gpio_cd)
-		pdata->gpio_cd = -1;
 
 	if (of_get_property(np, "cd-inverted", NULL))
 		pdata->cd_invert = true;