From 38e4d56a93446582ad8b6a219771c450ebb1ce25 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 27 Sep 2010 12:45:50 +0000
Subject: [PATCH] --- yaml --- r: 212154 b: refs/heads/master c:
 2f7e99bb9be6a2d8d7b808dc86037710cc8b7bf1 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/irq/chip.c   | 7 +++++++
 trunk/kernel/irq/manage.c | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 159065a14e3f..1a1940d4eda5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2ba2c30033c10cca2454f8b44bf98f5249e61c6
+refs/heads/master: 2f7e99bb9be6a2d8d7b808dc86037710cc8b7bf1
diff --git a/trunk/kernel/irq/chip.c b/trunk/kernel/irq/chip.c
index b7dd02a99c80..8775dd39ab3d 100644
--- a/trunk/kernel/irq/chip.c
+++ b/trunk/kernel/irq/chip.c
@@ -381,6 +381,11 @@ static int compat_irq_set_type(struct irq_data *data, unsigned int type)
 	return data->chip->set_type(data->irq, type);
 }
 
+static int compat_irq_set_wake(struct irq_data *data, unsigned int on)
+{
+	return data->chip->set_wake(data->irq, on);
+}
+
 static void compat_bus_lock(struct irq_data *data)
 {
 	data->chip->bus_lock(data->irq);
@@ -451,6 +456,8 @@ void irq_chip_set_defaults(struct irq_chip *chip)
 		chip->irq_set_affinity = compat_irq_set_affinity;
 	if (chip->set_type)
 		chip->irq_set_type = compat_irq_set_type;
+	if (chip->set_wake)
+		chip->irq_set_wake = compat_irq_set_wake;
 }
 
 static inline void mask_ack_irq(struct irq_desc *desc)
diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c
index 3618362b3d8d..644e8d5fa367 100644
--- a/trunk/kernel/irq/manage.c
+++ b/trunk/kernel/irq/manage.c
@@ -337,8 +337,8 @@ static int set_irq_wake_real(unsigned int irq, unsigned int on)
 	struct irq_desc *desc = irq_to_desc(irq);
 	int ret = -ENXIO;
 
-	if (desc->irq_data.chip->set_wake)
-		ret = desc->irq_data.chip->set_wake(irq, on);
+	if (desc->irq_data.chip->irq_set_wake)
+		ret = desc->irq_data.chip->irq_set_wake(&desc->irq_data, on);
 
 	return ret;
 }