---

yaml --- r: 268530 b: refs/heads/master c: f6d838d h: refs/heads/master v: v3
git-mirror · Sep 27, 2011 · fe759f2 · fe759f2
1 parent b2e45f7
commit fe759f2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ddbb08af050948a7dda0fb5db6bf6bc01d54528
+refs/heads/master: f6d838d7fecfd4e59a4ce7bdfb16165add36d26e
diff --git a/trunk/drivers/staging/iio/magnetometer/ak8975.c b/trunk/drivers/staging/iio/magnetometer/ak8975.c
@@ -477,7 +477,10 @@ static int ak8975_probe(struct i2c_client *client,
 	int err;
 
 	/* Grab and set up the supplied GPIO. */
-	eoc_gpio = irq_to_gpio(client->irq);
+	if (client->dev.platform_data == NULL)
+		eoc_gpio = -1;
+	else
+		eoc_gpio = *(int *)(client->dev.platform_data);
 
 	/* We may not have a GPIO based IRQ to scan, that is fine, we will
 	   poll if so */