From be1491ecd48d4a8fc83b95310c95fc7ddb5dc715 Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <aaro.koskinen@nokia.com>
Date: Mon, 19 Oct 2009 21:24:02 +0200
Subject: [PATCH] --- yaml --- r: 176040 b: refs/heads/master c:
 56baa667973e53d6d38af2ad3731d558566d818b h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/mfd/twl4030-power.c | 6 +++---
 trunk/include/linux/i2c/twl4030.h | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index caf0399dd123..e2a7c0c17ef2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4ead61e570d7b7bcf20a5a1733dd0bc37236c99
+refs/heads/master: 56baa667973e53d6d38af2ad3731d558566d818b
diff --git a/trunk/drivers/mfd/twl4030-power.c b/trunk/drivers/mfd/twl4030-power.c
index 3e41e0c0e4c6..9f98c36273d8 100644
--- a/trunk/drivers/mfd/twl4030-power.c
+++ b/trunk/drivers/mfd/twl4030-power.c
@@ -352,7 +352,7 @@ static int __init twl4030_configure_resource(struct twl4030_resconfig *rconfig)
 		return err;
 	}
 
-	if (rconfig->devgroup >= 0) {
+	if (rconfig->devgroup != TWL4030_RESCONFIG_UNDEF) {
 		grp &= ~DEV_GRP_MASK;
 		grp |= rconfig->devgroup << DEV_GRP_SHIFT;
 		err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
@@ -372,12 +372,12 @@ static int __init twl4030_configure_resource(struct twl4030_resconfig *rconfig)
 		return err;
 	}
 
-	if (rconfig->type >= 0) {
+	if (rconfig->type != TWL4030_RESCONFIG_UNDEF) {
 		type &= ~TYPE_MASK;
 		type |= rconfig->type << TYPE_SHIFT;
 	}
 
-	if (rconfig->type2 >= 0) {
+	if (rconfig->type2 != TWL4030_RESCONFIG_UNDEF) {
 		type &= ~TYPE2_MASK;
 		type |= rconfig->type2 << TYPE2_SHIFT;
 	}
diff --git a/trunk/include/linux/i2c/twl4030.h b/trunk/include/linux/i2c/twl4030.h
index e87cb270d8a1..8a4a58ff8dad 100644
--- a/trunk/include/linux/i2c/twl4030.h
+++ b/trunk/include/linux/i2c/twl4030.h
@@ -400,6 +400,7 @@ struct twl4030_power_data {
 	struct twl4030_script **scripts;
 	unsigned num;
 	struct twl4030_resconfig *resource_config;
+#define TWL4030_RESCONFIG_UNDEF	((u8)-1)
 };
 
 extern void twl4030_power_init(struct twl4030_power_data *triton2_scripts);