---

yaml --- r: 220640 b: refs/heads/master c: 7484552 h: refs/heads/master v: v3
git-mirror · Oct 28, 2010 · 1e1f7d4 · 1e1f7d4
1 parent d8977f4
commit 1e1f7d4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25d950714781f34e7ae1292f38889cf39983cb38
+refs/heads/master: 7484552eb24e3c62ef55a4ff0133d8450adea206
diff --git a/trunk/drivers/mfd/max8998.c b/trunk/drivers/mfd/max8998.c
@@ -153,6 +153,8 @@ static int max8998_i2c_probe(struct i2c_client *i2c,
 
 err:
 	mfd_remove_devices(max8998->dev);
+	max8998_irq_exit(max8998);
+	i2c_unregister_device(max8998->rtc);
 	kfree(max8998);
 	return ret;
 }
@@ -162,6 +164,8 @@ static int max8998_i2c_remove(struct i2c_client *i2c)
 	struct max8998_dev *max8998 = i2c_get_clientdata(i2c);
 
 	mfd_remove_devices(max8998->dev);
+	max8998_irq_exit(max8998);
+	i2c_unregister_device(max8998->rtc);
 	kfree(max8998);
 
 	return 0;