From 385135c43feca333df03ddde2ab69129823231e6 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Sat, 2 Jul 2011 22:38:11 +0200
Subject: [PATCH] --- yaml --- r: 261889 b: refs/heads/master c:
 7785bf11f312624101462d7dc840e27344899873 h: refs/heads/master i:   261887:
 96e7d189f65df991a4b4804f7ad8c8c09dc480a4 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/mfd/max8997-irq.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 04248eb484e7..e748fc64db01 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54f323b1325499574d92c85201971df096c25b79
+refs/heads/master: 7785bf11f312624101462d7dc840e27344899873
diff --git a/trunk/drivers/mfd/max8997-irq.c b/trunk/drivers/mfd/max8997-irq.c
index 638bf7e4d3b3..09274cf7c33b 100644
--- a/trunk/drivers/mfd/max8997-irq.c
+++ b/trunk/drivers/mfd/max8997-irq.c
@@ -58,8 +58,6 @@ static struct i2c_client *get_i2c(struct max8997_dev *max8997,
 	default:
 		return ERR_PTR(-EINVAL);
 	}
-
-	return ERR_PTR(-EINVAL);
 }
 
 struct max8997_irq_data {