From 0d7646e962046bd635bece895c9f3092598e09e4 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@distanz.ch>
Date: Fri, 5 Oct 2012 11:37:38 +0200
Subject: [PATCH] --- yaml --- r: 336806 b: refs/heads/master c:
 086d585f13542de205c25fd225a37aa0cadc3be0 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/gpio/gpio-omap.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 900073d71f80..70969f6fa841 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8944df726c7d2916764d18be8e944bd7ea3f2f51
+refs/heads/master: 086d585f13542de205c25fd225a37aa0cadc3be0
diff --git a/trunk/drivers/gpio/gpio-omap.c b/trunk/drivers/gpio/gpio-omap.c
index 94cbc842fbc3..eb73dee0ab33 100644
--- a/trunk/drivers/gpio/gpio-omap.c
+++ b/trunk/drivers/gpio/gpio-omap.c
@@ -1070,7 +1070,7 @@ static int __devinit omap_gpio_probe(struct platform_device *pdev)
 	if (!pdata)
 		return -EINVAL;
 
-	bank = devm_kzalloc(&pdev->dev, sizeof(struct gpio_bank), GFP_KERNEL);
+	bank = devm_kzalloc(dev, sizeof(struct gpio_bank), GFP_KERNEL);
 	if (!bank) {
 		dev_err(dev, "Memory alloc failed\n");
 		return -ENOMEM;