mfd: arizona: Add sensible return value to some error paths

PATCH RESEND Superseded Charles Keepax 1 participant 1 message Aug 30, 2016

Subsystems (2)

Multifunction devices (MFD) Wolfson microelectronics drivers

lore

Share & tools

lore

Charles Keepax

author

2016-08-30 09:26 UTC #0 lore raw

PATCH RESEND 1/1 mfd: arizona: Add sensible return value to some error paths

There are some cases in arizona_dev_init, such as where we don't recognise the chip ID, in which we head to the error path without setting a sensible error code in ret. This would lead to the chip silently failing probe, as it would still return 0. Fix this up by adding appropriate sets of the return value.

Signed-off-by Charles Keepax <[email protected]>

---
 drivers/mfd/arizona-core.c | 3 +++
 1 file changed, 3 insertions(+)

drivers/mfd/arizona-core.c +3 -0

index e4f97b3..34a2c26 100644
@@ -1121,6 +1121,7 @@ int arizona_dev_init(struct arizona *arizona)
 		break;
 	default:
 		dev_err(arizona->dev, "Unknown device ID: %x\n", reg);
+		ret = -EINVAL;
 		goto err_reset;
 	}

@@ -1280,12 +1281,14 @@ int arizona_dev_init(struct arizona *arizona)
 		break;
 	default:
 		dev_err(arizona->dev, "Unknown device ID %x\n", reg);
+		ret = -EINVAL;
 		goto err_reset;
 	}
 
 	if (!subdevs) {
 		dev_err(arizona->dev,
 			"No kernel support for device ID %x\n", reg);
+		ret = -EINVAL;
 		goto err_reset;
 	}

Signature · 1 line

2.1.4