diff --git a/[refs] b/[refs]
index 7c0f49af5126..e3190883de9d 100644
--- 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
index 0697ab3c422f..0e66d3f080b0 100644
--- 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 */