diff options
| author | Greg Kroah-Hartman | 2014-11-10 04:24:26 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-11-10 04:24:26 +0100 |
| commit | cc03f9bc2650634ce5ec0233f5ee12e6b67f74c6 (patch) | |
| tree | fc9726003631b9ed9da7fc73db53ed47317198cf /drivers/regulator/max77686.c | |
| parent | staging: rtl8188eu: unneeded NULL check (diff) | |
| parent | Linux 3.18-rc4 (diff) | |
| download | kernel-qcow2-linux-cc03f9bc2650634ce5ec0233f5ee12e6b67f74c6.tar.gz kernel-qcow2-linux-cc03f9bc2650634ce5ec0233f5ee12e6b67f74c6.tar.xz kernel-qcow2-linux-cc03f9bc2650634ce5ec0233f5ee12e6b67f74c6.zip | |
Merge 3.18-rc4 into staging-next
We want the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/regulator/max77686.c')
| -rw-r--r-- | drivers/regulator/max77686.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/max77686.c b/drivers/regulator/max77686.c index ef1af2debbd2..f69320e1738f 100644 --- a/drivers/regulator/max77686.c +++ b/drivers/regulator/max77686.c @@ -395,7 +395,7 @@ static int max77686_pmic_dt_parse_pdata(struct platform_device *pdev, struct max77686_dev *iodev = dev_get_drvdata(pdev->dev.parent); struct device_node *pmic_np, *regulators_np; struct max77686_regulator_data *rdata; - struct of_regulator_match rmatch; + struct of_regulator_match rmatch = { }; unsigned int i; pmic_np = iodev->dev->of_node; |