| Message ID | 1520859201-30549-1-git-send-email-pierre-yves.mordret@st.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Mar 12, 2018 at 01:53:21PM +0100, Pierre-Yves MORDRET wrote: > Before assigning returned setup structure check if not null > > Fixes: 463a9215f3ca7600b5ff ("i2c: stm32f7: fix setup structure") > Signed-off-by: Pierre-Yves MORDRET <pierre-yves.mordret@st.com> Maxime? Alexandre?
Hi Pierre-Yves On 03/12/2018 01:53 PM, Pierre-Yves MORDRET wrote: > Before assigning returned setup structure check if not null > > Fixes: 463a9215f3ca7600b5ff ("i2c: stm32f7: fix setup structure") > Signed-off-by: Pierre-Yves MORDRET <pierre-yves.mordret@st.com> > --- > Version history: > v1: > * Initial > --- > --- > drivers/i2c/busses/i2c-stm32f7.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c > index b445b3b..16c7d77 100644 > --- a/drivers/i2c/busses/i2c-stm32f7.c > +++ b/drivers/i2c/busses/i2c-stm32f7.c > @@ -888,6 +888,10 @@ static int stm32f7_i2c_probe(struct platform_device *pdev) > } > > setup = of_device_get_match_data(&pdev->dev); > + if (!setup) { > + dev_err(&pdev->dev, "Can't get device data\n"); > + goto clk_free; You have to fill "ret" with error statement before go to "clk_free" > + } > i2c_dev->setup = *setup; > > ret = device_property_read_u32(i2c_dev->dev, "i2c-scl-rising-time-ns", >
diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c index b445b3b..16c7d77 100644 --- a/drivers/i2c/busses/i2c-stm32f7.c +++ b/drivers/i2c/busses/i2c-stm32f7.c @@ -888,6 +888,10 @@ static int stm32f7_i2c_probe(struct platform_device *pdev) } setup = of_device_get_match_data(&pdev->dev); + if (!setup) { + dev_err(&pdev->dev, "Can't get device data\n"); + goto clk_free; + } i2c_dev->setup = *setup; ret = device_property_read_u32(i2c_dev->dev, "i2c-scl-rising-time-ns",
Before assigning returned setup structure check if not null Fixes: 463a9215f3ca7600b5ff ("i2c: stm32f7: fix setup structure") Signed-off-by: Pierre-Yves MORDRET <pierre-yves.mordret@st.com> --- Version history: v1: * Initial --- --- drivers/i2c/busses/i2c-stm32f7.c | 4 ++++ 1 file changed, 4 insertions(+)