ARM: OMAP3+: Fix kernel panic on boot
Subsystems (2)
PATCH 1/1 ARM: OMAP3+: Fix kernel panic on boot
Commit 8a6aaa3 (mfd: twl-core: Collect global variables behind one private structure (global)) removed the variable "inuse" that is used to determine if the device has been initialised and now use the twl_priv structure instead. This is causing the kernel to panic on OMAP3+ devices using the twl driver, because we try to access the twl_priv->ready member before checking if twl_priv is initialised. Fix this and move this test to the beginning of the twl_i2c_read/write function because twl_get_last_module() also uses the twl_priv structure.
--- drivers/mfd/twl-core.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/mfd/twl-core.c +8 -8
@@ -316,12 +316,12 @@ int twl_i2c_write(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes)int sid;struct twl_client *twl; -if (unlikely (mod_no >=twl_get_last_module ())) { -pr_err ("%s: invalid module number %d\n" ,DRIVER_NAME , mod_no); +if (unlikely (!twl_priv || !twl_priv->ready)) { +pr_err ("%s: not initialized\n" ,DRIVER_NAME );return -EPERM ; } -if (unlikely (!twl_priv->ready)) { -pr_err ("%s: not initialized\n" ,DRIVER_NAME ); +if (unlikely (mod_no >=twl_get_last_module ())) { +pr_err ("%s: invalid module number %d\n" ,DRIVER_NAME , mod_no);return -EPERM ; }
@@ -355,12 +355,12 @@ int twl_i2c_read(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes)int sid;struct twl_client *twl; -if (unlikely (mod_no >=twl_get_last_module ())) { -pr_err ("%s: invalid module number %d\n" ,DRIVER_NAME , mod_no); +if (unlikely (!twl_priv || !twl_priv->ready)) { +pr_err ("%s: not initialized\n" ,DRIVER_NAME );return -EPERM ; } -if (unlikely (!twl_priv->ready)) { -pr_err ("%s: not initialized\n" ,DRIVER_NAME ); +if (unlikely (mod_no >=twl_get_last_module ())) { +pr_err ("%s: invalid module number %d\n" ,DRIVER_NAME , mod_no);return -EPERM ; }
Signature · 1 line
1.7.10.4
PATCH 1/1 ARM: OMAP3+: Fix kernel panic on boot
Hi Jon,
Quoted 9 lines · Jon Hunter
Commit 8a6aaa3 (mfd: twl-core: Collect global variables behind one private structure (global)) removed the variable "inuse" that is used to determine if the device has been initialised and now use the
twl_privstructure instead. This is causing the kernel to panic on OMAP3+ devices using the twl driver, because we try to access thetwl_priv->readymember before checking iftwl_privis initialised. Fix this and move this test to the beginning of the twl_i2c_read/write function becausetwl_get_last_module()also uses thetwl_privstructure.
Quoted 5 lines
Signed-off-by Jon Hunter <[email protected]>Acked-by Peter Ujfalusi <[email protected]>--- drivers/mfd/twl-core.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
Patch applied, thanks.
I fixed the subject as it's codewise not ARM or OMAP3 related, but rather mfd and twl-core.
Cheers,
Samuel.
Signature · 2 lines
Intel Open Source Technology Centre http://oss.intel.com/
PATCH 1/1 ARM: OMAP3+: Fix kernel panic on boot
Quoted 12 lines · Samuel Ortiz
Hi Jon,
Quoted 9 lines · Jon Hunter
Commit 8a6aaa3 (mfd: twl-core: Collect global variables behind one private structure (global)) removed the variable "inuse" that is used to determine if the device has been initialised and now use the
twl_privstructure instead. This is causing the kernel to panic on OMAP3+ devices using the twl driver, because we try to access thetwl_priv->readymember before checking iftwl_privis initialised. Fix this and move this test to the beginning of the twl_i2c_read/write function becausetwl_get_last_module()also uses thetwl_privstructure.
Quoted 8 lines
Quoted 5 lines
Signed-off-by Jon Hunter <[email protected]>Acked-by Peter Ujfalusi <[email protected]>--- drivers/mfd/twl-core.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)Patch applied, thanks.
I fixed the subject as it's codewise not ARM or OMAP3 related, but rather mfd and twl-core.
Good point! Thanks Jon