diff options
| author | Krzysztof Kozlowski | 2014-02-11 11:03:31 +0100 |
|---|---|---|
| committer | Lee Jones | 2014-03-19 09:58:09 +0100 |
| commit | b9e183a1d495cd65412abe0f9df19b151716bfe7 (patch) | |
| tree | 9a1565b8bea3c398d39a9f8783e1e5a161f3f6ed /drivers/mfd/max77686.c | |
| parent | mfd: max8997: Fix possible NULL pointer dereference on i2c_new_dummy error (diff) | |
| download | kernel-qcow2-linux-b9e183a1d495cd65412abe0f9df19b151716bfe7.tar.gz kernel-qcow2-linux-b9e183a1d495cd65412abe0f9df19b151716bfe7.tar.xz kernel-qcow2-linux-b9e183a1d495cd65412abe0f9df19b151716bfe7.zip | |
mfd: max77686: Fix possible NULL pointer dereference on i2c_new_dummy error
During probe the driver allocates dummy I2C device for RTC with
i2c_new_dummy() but it does not check the return value of this call.
In case of error (i2c_new_device(): memory allocation failure or I2C
address cannot be used) this function returns NULL which is later used
by i2c_unregister_device().
If i2c_new_dummy() fails for RTC device, fail also the probe for main
MFD driver.
Cc: stable@vger.kernel.org
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/max77686.c')
| -rw-r--r-- | drivers/mfd/max77686.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c index f53d5823a3f7..e5fce765accb 100644 --- a/drivers/mfd/max77686.c +++ b/drivers/mfd/max77686.c @@ -121,6 +121,10 @@ static int max77686_i2c_probe(struct i2c_client *i2c, dev_info(max77686->dev, "device found\n"); max77686->rtc = i2c_new_dummy(i2c->adapter, I2C_ADDR_RTC); + if (!max77686->rtc) { + dev_err(max77686->dev, "Failed to allocate I2C device for RTC\n"); + return -ENODEV; + } i2c_set_clientdata(max77686->rtc, max77686); max77686_irq_init(max77686); |