2012-11-21 04:41:16

by Sachin Kamat

Subject: [PATCH 1/2] extcon: max77693: Fix uninitialised variable warning

Signed-off-by: Sachin Kamat <[email protected]>
---
Hi Chanwoo,

Please merge this patch with the previous one titled
"extcon: max77693: Use devm_kzalloc"
---
drivers/extcon/extcon-max77693.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/extcon/extcon-max77693.c b/drivers/extcon/extcon-max77693.c
index 3c29bb7..1da4ad4 100644
--- a/drivers/extcon/extcon-max77693.c
+++ b/drivers/extcon/extcon-max77693.c
@@ -672,9 +672,10 @@ static int __devinit max77693_muic_probe(struct platform_device *pdev)
info->max77693->muic,
&max77693_muic_regmap_config);
if (IS_ERR(info->max77693->regmap_muic)) {
+ ret = PTR_ERR(info->max77693->regmap_muic);
dev_err(max77693->dev,
"failed to allocate register map: %d\n", ret);
- return PTR_ERR(info->max77693->regmap_muic);
+ return ret;
}
}
platform_set_drvdata(pdev, info);
--
1.7.4.1

2012-11-21 04:41:21

by Sachin Kamat

Subject: [PATCH 2/2] extcon: max77693: Fix coding style

As per kernel coding style, if one branch of conditional statement has braces,
the other one should have too.

Signed-off-by: Sachin Kamat <[email protected]>
---
drivers/extcon/extcon-max77693.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/extcon/extcon-max77693.c b/drivers/extcon/extcon-max77693.c
index 1da4ad4..8bf5e48 100644
--- a/drivers/extcon/extcon-max77693.c
+++ b/drivers/extcon/extcon-max77693.c
@@ -665,9 +665,9 @@ static int __devinit max77693_muic_probe(struct platform_device *pdev)
}
info->dev = &pdev->dev;
info->max77693 = max77693;
- if (info->max77693->regmap_muic)
+ if (info->max77693->regmap_muic) {
dev_dbg(&pdev->dev, "allocate register map\n");
- else {
+ } else {
info->max77693->regmap_muic = devm_regmap_init_i2c(
info->max77693->muic,
&max77693_muic_regmap_config);
--
1.7.4.1