Skip to contentSkip to conversation

twl4030: Add some error checking to twl4030 init

PATCH In review Amit Kucheria 5 participants 9 messages Apr 20, 2009 – Jun 3, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 twl4030: Add some error checking to twl4030 init

Check for return values of i2c read/write operations and size of scripts being uploaded to TWL4030

---
 drivers/mfd/twl4030-core.c  |    2 +-
 drivers/mfd/twl4030-power.c |   52 +++++++++++++++++++++++++++++++-----------
 2 files changed, 39 insertions(+), 15 deletions(-)
drivers/mfd/twl4030-core.c +1 -1
index 769b34b..067b02e 100644
@@ -358,7 +358,7 @@ EXPORT_SYMBOL(twl4030_i2c_read);
 int twl4030_i2c_write_u8(u8 mod_no, u8 value, u8 reg)
 {
 
-	/* 2 bytes offset 1 contains the data offset 0 is used by i2c_write */
+	/* 2 bytes: offset 1 contains the data, offset 0 is used by i2c_write */
 	u8 temp_buffer[2] = { 0 };
 	/* offset 1 contains the data */
 	temp_buffer[1] = value;
drivers/mfd/twl4030-power.c +38 -14

103 lines not on this page · raw message

Signature · 1 line
1.5.6.3
#1 lore raw
Quoted 7 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Amit Kucheria
Sent: Monday, April 20, 2009 6:20 PM
To: [email protected]
Subject: [PATCH] twl4030: Add some error checking to twl4030 init

Quoted 6 lines

Check for return values of i2c read/write operations and size of scripts being
uploaded to TWL4030

[sp] You may want to fix the leading whitespaces in some places.
see few instanes below.
Otherwise, looks pretty straight.

Quoted 48 lines
---
 drivers/mfd/twl4030-core.c  |    2 +-
 drivers/mfd/twl4030-power.c |   52 
+++++++++++++++++++++++++++++++-----------
 2 files changed, 39 insertions(+), 15 deletions(-)
drivers/mfd/twl4030-core.c +0 -1
index 769b34b..067b02e 100644
@@ -358,7 +358,7 @@ EXPORT_SYMBOL(twl4030_i2c_read);
 int twl4030_i2c_write_u8(u8 mod_no, u8 value, u8 reg)
 {
 
-	/* 2 bytes offset 1 contains the data offset 0 is used 

by i2c_write */

drivers/mfd/twl4030-core.c +1 -0
+	/* 2 bytes: offset 1 contains the data, offset 0 is 

used by i2c_write */

drivers/mfd/twl4030-core.c +0 -0
 	u8 temp_buffer[2] = { 0 };
 	/* offset 1 contains the data */
 	temp_buffer[1] = value;
drivers/mfd/twl4030-power.c +3 -2
index 9dc493b..8f5d149 100644
@@ -257,36 +257,40 @@ static int __init 
 config_warmreset_sequence(u8 address)
 	return err;
 }
 
-void twl4030_configure_resource(struct twl4030_resconfig *rconfig)
+static int __init twl4030_configure_resource(struct 
 twl4030_resconfig *rconfig)
 {
 	int rconfig_addr;
+	int err;
 	u8 type;
 
 	if (rconfig->resource > NUM_OF_RESOURCES) {
 		printk(KERN_ERR
 			"TWL4030 Resource %d does not exist\n",
 			rconfig->resource);
-		return;
+		return -EINVAL;
 	}
 
 	rconfig_addr = res_config_addrs[rconfig->resource];
 

drivers/mfd/twl4030-power.c static int __init · line 284

Quoted 10 lines
drivers/mfd/twl4030-power.c +4 -2
 	/* Set resource group */
-
 	if (rconfig->devgroup >= 0)
-		twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
+		err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
 					rconfig->devgroup << 5,
 					rconfig_addr + DEVGROUP_OFFSET);
+	if (err < 0) {
+		printk(KERN_ERR
+		       "TWL4030 failed to program devgroup");

[sp] ...here...

Quoted 8 lines
drivers/mfd/twl4030-power.c +2 -4
+		return err;
+	}
 
 	/* Set resource types */
-
-	if (twl4030_i2c_read_u8(TWL4030_MODULE_PM_RECEIVER,
-					&type,
-					rconfig_addr + 

drivers/mfd/twl4030-power.c static int __init config_warmreset_sequence(u8 address) · line 292

Quoted 10 lines
drivers/mfd/twl4030-power.c +5 -3
 TYPE_OFFSET) < 0) {
+	err = twl4030_i2c_read_u8(TWL4030_MODULE_PM_RECEIVER, &type,
+				  rconfig_addr + TYPE_OFFSET);
+	if (err < 0) {
 		printk(KERN_ERR
-			"TWL4030 Resource %d type could not read\n",
-			rconfig->resource);
-		return;
+		       "TWL4030 Resource %d type could not be read\n",
+		       rconfig->resource);

[sp] ...here...

Quoted 5 lines
drivers/mfd/twl4030-power.c +1 -0
+		return err;
drivers/mfd/twl4030-power.c +0 -0
 	}
 
 	if (rconfig->type >= 0) {

drivers/mfd/twl4030-power.c void twl4030_configure_resource(struct · line 311

Quoted 10 lines
drivers/mfd/twl4030-power.c +4 -1
@@ -299,8 +303,15 @@ void twl4030_configure_resource(struct 
 twl4030_resconfig *rconfig)
 		type |= rconfig->type2 << 3;
 	}
 
-	twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
+	err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
 				type, rconfig_addr + TYPE_OFFSET);
+	if (err < 0) {
+		printk(KERN_ERR
+		       "TWL4030 failed to program resource type");

[sp] ...here...

Quoted 34 lines
drivers/mfd/twl4030-power.c +10 -0
+		return err;
+	}
+
+	return 0;
 
 }
@@ -309,6 +320,12 @@ static int __init 
 load_triton_script(struct twl4030_script *tscript)
 	u8 address = triton_next_free_address;
 	int err;
 
+	/* Make sure the script isn't going beyond last valid address */
+	if ((address + tscript->size) > (END_OF_SCRIPT-1)) {
+		printk(KERN_ERR "TWL4030 script too big error\n");
+		return -EINVAL;
+	}
+
 	err = twl4030_write_script(address, tscript->script, 
 tscript->size);
drivers/mfd/twl4030-power.c +3 -1
 	if (err)
 		return err;
@@ -346,15 +363,22 @@ void __init twl4030_power_init(struct 
 twl4030_power_data *triton2_scripts)
 
 	for (i = 0; i < triton2_scripts->size; i++) {
 		err = load_triton_script(triton2_scripts->scripts[i]);
-		if (err)
+		if (err < 0) {
+			printk(KERN_ERR "TWL4030 failed to load 
 scripts");
 			break;
+		}
 	}

drivers/mfd/twl4030-power.c void __init twl4030_power_init(struct · line 381

Quoted 10 lines
drivers/mfd/twl4030-power.c +4 -1
 
 	resconfig = triton2_scripts->resource_config;
 	if (resconfig) {
 		while (resconfig->resource) {
-			twl4030_configure_resource(resconfig);
+			err = twl4030_configure_resource(resconfig);
 			resconfig++;
+			if (err < 0) {
+				printk(KERN_ERR
+				       "TWL4030 failed to 

[sp] ...here...

Quoted 16 lines
drivers/mfd/twl4030-power.c +2 -0
 configure resource");
+				break;
+			}
drivers/mfd/twl4030-power.c +0 -0
 		}
 	}
Signature · 8 lines
-- 
1.5.6.3

--
To unsubscribe from this list: send the line "unsubscribe 
linux-omap" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#2 lore raw

PATCH 1/1 twl4030: Add some error checking to twl4030 init

Whitespace-fixed version and passed through checkpatch.pl

Check for return values of i2c read/write operations and size of scripts being uploaded to TWL4030

---
 drivers/mfd/twl4030-core.c  |    2 +-
 drivers/mfd/twl4030-power.c |   49 ++++++++++++++++++++++++++++++------------
 2 files changed, 36 insertions(+), 15 deletions(-)
drivers/mfd/twl4030-core.c +1 -1
index 769b34b..067b02e 100644
@@ -358,7 +358,7 @@ EXPORT_SYMBOL(twl4030_i2c_read);
 int twl4030_i2c_write_u8(u8 mod_no, u8 value, u8 reg)
 {
 
-	/* 2 bytes offset 1 contains the data offset 0 is used by i2c_write */
+	/* 2 bytes: offset 1 contains the data, offset 0 is used by i2c_write */
 	u8 temp_buffer[2] = { 0 };
 	/* offset 1 contains the data */
 	temp_buffer[1] = value;
drivers/mfd/twl4030-power.c +35 -14

100 lines not on this page · raw message

Signature · 1 line
1.6.0.4
#4 lore raw
In reply to Amit Kucheria
Quoted 9 lines · Amit Kucheria

Whitespace-fixed version and passed through checkpatch.pl

Check for return values of i2c read/write operations and size of scripts being uploaded to TWL4030

---
 drivers/mfd/twl4030-core.c  |    2 +-
 drivers/mfd/twl4030-power.c |   49 ++++++++++++++++++++++++++++++------------

The changes look OK ... but what this needs is to be split into two patches. The -core one should go to mainline; it's trivial, comment-only, unrelated to the $SUBJECT patch. The -power one seems OK for merge to the OMAP tree.

(Of course, the -power driver should probably go mainline at some point. Once it stops breaking warm-reset!)

Quoted 132 lines
 2 files changed, 36 insertions(+), 15 deletions(-)
drivers/mfd/twl4030-core.c +1 -1
index 769b34b..067b02e 100644
@@ -358,7 +358,7 @@ EXPORT_SYMBOL(twl4030_i2c_read);
 int twl4030_i2c_write_u8(u8 mod_no, u8 value, u8 reg)
 {
 
-	/* 2 bytes offset 1 contains the data offset 0 is used by i2c_write */
+	/* 2 bytes: offset 1 contains the data, offset 0 is used by i2c_write */
 	u8 temp_buffer[2] = { 0 };
 	/* offset 1 contains the data */
 	temp_buffer[1] = value;
drivers/mfd/twl4030-power.c +35 -14
index 9dc493b..b4b636d 100644
@@ -257,36 +257,38 @@ static int __init config_warmreset_sequence(u8 address)
 	return err;
 }
 
-void twl4030_configure_resource(struct twl4030_resconfig *rconfig)
+static int __init twl4030_configure_resource(struct twl4030_resconfig *rconfig)
 {
 	int rconfig_addr;
+	int err;
 	u8 type;
 
 	if (rconfig->resource > NUM_OF_RESOURCES) {
 		printk(KERN_ERR
 			"TWL4030 Resource %d does not exist\n",
 			rconfig->resource);
-		return;
+		return -EINVAL;
 	}
 
 	rconfig_addr = res_config_addrs[rconfig->resource];
 
 	/* Set resource group */
-
 	if (rconfig->devgroup >= 0)
-		twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
+		err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
 					rconfig->devgroup << 5,
 					rconfig_addr + DEVGROUP_OFFSET);
+	if (err < 0) {
+		printk(KERN_ERR "TWL4030 failed to program devgroup");
+		return err;
+	}
 
 	/* Set resource types */
-
-	if (twl4030_i2c_read_u8(TWL4030_MODULE_PM_RECEIVER,
-					&type,
-					rconfig_addr + TYPE_OFFSET) < 0) {
-		printk(KERN_ERR
-			"TWL4030 Resource %d type could not read\n",
+	err = twl4030_i2c_read_u8(TWL4030_MODULE_PM_RECEIVER, &type,
+				  rconfig_addr + TYPE_OFFSET);
+	if (err < 0) {
+		printk(KERN_ERR "TWL4030 Resource %d type could not be read\n",
 			rconfig->resource);
-		return;
+		return err;
 	}
 
 	if (rconfig->type >= 0) {
@@ -299,8 +301,14 @@ void twl4030_configure_resource(struct twl4030_resconfig *rconfig)
 		type |= rconfig->type2 << 3;
 	}
 
-	twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
+	err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
 				type, rconfig_addr + TYPE_OFFSET);
+	if (err < 0) {
+		printk(KERN_ERR "TWL4030 failed to program resource type");
+		return err;
+	}
+
+	return 0;
 
 }
 
@@ -309,6 +317,12 @@ static int __init load_triton_script(struct twl4030_script *tscript)
 	u8 address = triton_next_free_address;
 	int err;
 
+	/* Make sure the script isn't going beyond last valid address */
+	if ((address + tscript->size) > (END_OF_SCRIPT-1)) {
+		printk(KERN_ERR "TWL4030 script too big error\n");
+		return -EINVAL;
+	}
+
 	err = twl4030_write_script(address, tscript->script, tscript->size);
 	if (err)
 		return err;
@@ -346,15 +360,22 @@ void __init twl4030_power_init(struct twl4030_power_data *triton2_scripts)
 
 	for (i = 0; i < triton2_scripts->size; i++) {
 		err = load_triton_script(triton2_scripts->scripts[i]);
-		if (err)
+		if (err < 0) {
+			printk(KERN_ERR "TWL4030 failed to load scripts");
 			break;
+		}
 	}
 
 	resconfig = triton2_scripts->resource_config;
 	if (resconfig) {
 		while (resconfig->resource) {
-			twl4030_configure_resource(resconfig);
+			err = twl4030_configure_resource(resconfig);
 			resconfig++;
+			if (err < 0) {
+				printk(KERN_ERR
+					"TWL4030 failed to configure resource");
+				break;
+			}
 		}
 	}
 
Signature · 6 lines
1.6.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#5 lore raw

PATCH 1/1 twl4030: Add some error checking to twl4030 init

Check for return values of i2c read/write operations and size of scripts being uploaded to TWL4030

(Removed the unrelated string changes based on David Brownell's comment)

---
 drivers/mfd/twl4030-power.c |   52 +++++++++++++++++++++++++++++++-----------
 1 files changed, 38 insertions(+), 14 deletions(-)
drivers/mfd/twl4030-power.c +38 -14
index 9dc493b..8f5d149 100644
@@ -257,36 +257,40 @@ static int __init config_warmreset_sequence(u8 address)
 	return err;
 }
 
-void twl4030_configure_resource(struct twl4030_resconfig *rconfig)
+static int __init twl4030_configure_resource(struct twl4030_resconfig *rconfig)
 {
 	int rconfig_addr;
+	int err;
 	u8 type;
 
 	if (rconfig->resource > NUM_OF_RESOURCES) {
 		printk(KERN_ERR
 			"TWL4030 Resource %d does not exist\n",
 			rconfig->resource);
-		return;
+		return -EINVAL;
 	}
 
 	rconfig_addr = res_config_addrs[rconfig->resource];
 
 	/* Set resource group */
-
 	if (rconfig->devgroup >= 0)
-		twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
+		err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
 					rconfig->devgroup << 5,
 					rconfig_addr + DEVGROUP_OFFSET);
+	if (err < 0) {
+		printk(KERN_ERR
+		       "TWL4030 failed to program devgroup");
+		return err;
+	}
 
 	/* Set resource types */
-
-	if (twl4030_i2c_read_u8(TWL4030_MODULE_PM_RECEIVER,
-					&type,
-					rconfig_addr + TYPE_OFFSET) < 0) {
+	err = twl4030_i2c_read_u8(TWL4030_MODULE_PM_RECEIVER, &type,
+				  rconfig_addr + TYPE_OFFSET);
+	if (err < 0) {
 		printk(KERN_ERR
-			"TWL4030 Resource %d type could not read\n",
-			rconfig->resource);
-		return;
+		       "TWL4030 Resource %d type could not be read\n",
+		       rconfig->resource);
+		return err;
 	}
 
 	if (rconfig->type >= 0) {
@@ -299,8 +303,15 @@ void twl4030_configure_resource(struct twl4030_resconfig *rconfig)
 		type |= rconfig->type2 << 3;
 	}
 
-	twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
+	err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
 				type, rconfig_addr + TYPE_OFFSET);
+	if (err < 0) {
+		printk(KERN_ERR
+		       "TWL4030 failed to program resource type");
+		return err;
+	}
+
+	return 0;
 
 }
 
@@ -309,6 +320,12 @@ static int __init load_triton_script(struct twl4030_script *tscript)
 	u8 address = triton_next_free_address;
 	int err;
 
+	/* Make sure the script isn't going beyond last valid address */
+	if ((address + tscript->size) > (END_OF_SCRIPT-1)) {
+		printk(KERN_ERR "TWL4030 script too big error\n");
+		return -EINVAL;
+	}
+
 	err = twl4030_write_script(address, tscript->script, tscript->size);
 	if (err)
 		return err;
@@ -346,15 +363,22 @@ void __init twl4030_power_init(struct twl4030_power_data *triton2_scripts)
 
 	for (i = 0; i < triton2_scripts->size; i++) {
 		err = load_triton_script(triton2_scripts->scripts[i]);
-		if (err)
+		if (err < 0) {
+			printk(KERN_ERR "TWL4030 failed to load scripts");
 			break;
+		}
 	}
 
 	resconfig = triton2_scripts->resource_config;
 	if (resconfig) {
 		while (resconfig->resource) {
-			twl4030_configure_resource(resconfig);
+			err = twl4030_configure_resource(resconfig);
 			resconfig++;
+			if (err < 0) {
+				printk(KERN_ERR
+				       "TWL4030 failed to configure resource");
+				break;
+			}
 		}
 	}
 
Signature · 1 line
1.6.0.4
#6 lore raw

Bump..

This patch was acked by David Brownell earlier in the thread.

Regards,
Amit

Quoted 128 lines · Amit Kucheria

Check for return values of i2c read/write operations and size of scripts being uploaded to TWL4030

(Removed the unrelated string changes based on David Brownell's comment)

---
 drivers/mfd/twl4030-power.c |   52 +++++++++++++++++++++++++++++++-----------
 1 files changed, 38 insertions(+), 14 deletions(-)
drivers/mfd/twl4030-power.c +38 -14
index 9dc493b..8f5d149 100644
@@ -257,36 +257,40 @@ static int __init config_warmreset_sequence(u8 address)
 	return err;
 }
 
-void twl4030_configure_resource(struct twl4030_resconfig *rconfig)
+static int __init twl4030_configure_resource(struct twl4030_resconfig *rconfig)
 {
 	int rconfig_addr;
+	int err;
 	u8 type;
 
 	if (rconfig->resource > NUM_OF_RESOURCES) {
 		printk(KERN_ERR
 			"TWL4030 Resource %d does not exist\n",
 			rconfig->resource);
-		return;
+		return -EINVAL;
 	}
 
 	rconfig_addr = res_config_addrs[rconfig->resource];
 
 	/* Set resource group */
-
 	if (rconfig->devgroup >= 0)
-		twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
+		err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
 					rconfig->devgroup << 5,
 					rconfig_addr + DEVGROUP_OFFSET);
+	if (err < 0) {
+		printk(KERN_ERR
+		       "TWL4030 failed to program devgroup");
+		return err;
+	}
 
 	/* Set resource types */
-
-	if (twl4030_i2c_read_u8(TWL4030_MODULE_PM_RECEIVER,
-					&type,
-					rconfig_addr + TYPE_OFFSET) < 0) {
+	err = twl4030_i2c_read_u8(TWL4030_MODULE_PM_RECEIVER, &type,
+				  rconfig_addr + TYPE_OFFSET);
+	if (err < 0) {
 		printk(KERN_ERR
-			"TWL4030 Resource %d type could not read\n",
-			rconfig->resource);
-		return;
+		       "TWL4030 Resource %d type could not be read\n",
+		       rconfig->resource);
+		return err;
 	}
 
 	if (rconfig->type >= 0) {
@@ -299,8 +303,15 @@ void twl4030_configure_resource(struct twl4030_resconfig *rconfig)
 		type |= rconfig->type2 << 3;
 	}
 
-	twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
+	err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
 				type, rconfig_addr + TYPE_OFFSET);
+	if (err < 0) {
+		printk(KERN_ERR
+		       "TWL4030 failed to program resource type");
+		return err;
+	}
+
+	return 0;
 
 }
 
@@ -309,6 +320,12 @@ static int __init load_triton_script(struct twl4030_script *tscript)
 	u8 address = triton_next_free_address;
 	int err;
 
+	/* Make sure the script isn't going beyond last valid address */
+	if ((address + tscript->size) > (END_OF_SCRIPT-1)) {
+		printk(KERN_ERR "TWL4030 script too big error\n");
+		return -EINVAL;
+	}
+
 	err = twl4030_write_script(address, tscript->script, tscript->size);
 	if (err)
 		return err;
@@ -346,15 +363,22 @@ void __init twl4030_power_init(struct twl4030_power_data *triton2_scripts)
 
 	for (i = 0; i < triton2_scripts->size; i++) {
 		err = load_triton_script(triton2_scripts->scripts[i]);
-		if (err)
+		if (err < 0) {
+			printk(KERN_ERR "TWL4030 failed to load scripts");
 			break;
+		}
 	}
 
 	resconfig = triton2_scripts->resource_config;
 	if (resconfig) {
 		while (resconfig->resource) {
-			twl4030_configure_resource(resconfig);
+			err = twl4030_configure_resource(resconfig);
 			resconfig++;
+			if (err < 0) {
+				printk(KERN_ERR
+				       "TWL4030 failed to configure resource");
+				break;
+			}
 		}
 	}
 
Signature · 6 lines
1.6.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Signature · 3 lines
-------------------------------------------------------------------------
Amit Kucheria,				 Kernel Developer, Verdurent
-------------------------------------------------------------------------
maintainer
#7 lore raw
Quoted 3 lines · Amit Kucheria

Bump..

This patch was acked by David Brownell earlier in the thread.

OK, I add it, but will reset all the twl stuff to mainline after 2.6.30.

These patches need to get submitted to mainline, all the other twl code is there already.

Tony

Quoted 141 lines

Regards,
Amit

Quoted 128 lines · Amit Kucheria

Check for return values of i2c read/write operations and size of scripts being uploaded to TWL4030

(Removed the unrelated string changes based on David Brownell's comment)

---
 drivers/mfd/twl4030-power.c |   52 +++++++++++++++++++++++++++++++-----------
 1 files changed, 38 insertions(+), 14 deletions(-)
drivers/mfd/twl4030-power.c +38 -14
index 9dc493b..8f5d149 100644
@@ -257,36 +257,40 @@ static int __init config_warmreset_sequence(u8 address)
 	return err;
 }
 
-void twl4030_configure_resource(struct twl4030_resconfig *rconfig)
+static int __init twl4030_configure_resource(struct twl4030_resconfig *rconfig)
 {
 	int rconfig_addr;
+	int err;
 	u8 type;
 
 	if (rconfig->resource > NUM_OF_RESOURCES) {
 		printk(KERN_ERR
 			"TWL4030 Resource %d does not exist\n",
 			rconfig->resource);
-		return;
+		return -EINVAL;
 	}
 
 	rconfig_addr = res_config_addrs[rconfig->resource];
 
 	/* Set resource group */
-
 	if (rconfig->devgroup >= 0)
-		twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
+		err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
 					rconfig->devgroup << 5,
 					rconfig_addr + DEVGROUP_OFFSET);
+	if (err < 0) {
+		printk(KERN_ERR
+		       "TWL4030 failed to program devgroup");
+		return err;
+	}
 
 	/* Set resource types */
-
-	if (twl4030_i2c_read_u8(TWL4030_MODULE_PM_RECEIVER,
-					&type,
-					rconfig_addr + TYPE_OFFSET) < 0) {
+	err = twl4030_i2c_read_u8(TWL4030_MODULE_PM_RECEIVER, &type,
+				  rconfig_addr + TYPE_OFFSET);
+	if (err < 0) {
 		printk(KERN_ERR
-			"TWL4030 Resource %d type could not read\n",
-			rconfig->resource);
-		return;
+		       "TWL4030 Resource %d type could not be read\n",
+		       rconfig->resource);
+		return err;
 	}
 
 	if (rconfig->type >= 0) {
@@ -299,8 +303,15 @@ void twl4030_configure_resource(struct twl4030_resconfig *rconfig)
 		type |= rconfig->type2 << 3;
 	}
 
-	twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
+	err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
 				type, rconfig_addr + TYPE_OFFSET);
+	if (err < 0) {
+		printk(KERN_ERR
+		       "TWL4030 failed to program resource type");
+		return err;
+	}
+
+	return 0;
 
 }
 
@@ -309,6 +320,12 @@ static int __init load_triton_script(struct twl4030_script *tscript)
 	u8 address = triton_next_free_address;
 	int err;
 
+	/* Make sure the script isn't going beyond last valid address */
+	if ((address + tscript->size) > (END_OF_SCRIPT-1)) {
+		printk(KERN_ERR "TWL4030 script too big error\n");
+		return -EINVAL;
+	}
+
 	err = twl4030_write_script(address, tscript->script, tscript->size);
 	if (err)
 		return err;
@@ -346,15 +363,22 @@ void __init twl4030_power_init(struct twl4030_power_data *triton2_scripts)
 
 	for (i = 0; i < triton2_scripts->size; i++) {
 		err = load_triton_script(triton2_scripts->scripts[i]);
-		if (err)
+		if (err < 0) {
+			printk(KERN_ERR "TWL4030 failed to load scripts");
 			break;
+		}
 	}
 
 	resconfig = triton2_scripts->resource_config;
 	if (resconfig) {
 		while (resconfig->resource) {
-			twl4030_configure_resource(resconfig);
+			err = twl4030_configure_resource(resconfig);
 			resconfig++;
+			if (err < 0) {
+				printk(KERN_ERR
+				       "TWL4030 failed to configure resource");
+				break;
+			}
 		}
 	}
 
Signature · 6 lines
1.6.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Signature · 7 lines
-------------------------------------------------------------------------
Amit Kucheria,				 Kernel Developer, Verdurent
-------------------------------------------------------------------------
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
maintainer
#8 lore raw

PATCH 1/1 twl4030: Add some error checking to twl4030 init

In reply to Amit Kucheria

This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Initial commit ID (Likely to change): 944f94235969c15b3012aa4dc832ed3e2f08e4da

PatchWorks
http://patchwork.kernel.org/patch/22012/

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=944f94235969c15b3012aa4dc832ed3e2f08e4da