| Message ID | 20240925112442.1732416-1-changhuang.liang@starfivetech.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | [v3] reset: starfive: jh71x0: Fix accessing the empty member on JH7110 SoC | expand |
On Mi, 2024-09-25 at 04:24 -0700, Changhuang Liang wrote: > data->asserted will be NULL on JH7110 SoC since commit 82327b127d41 > ("reset: starfive: Add StarFive JH7110 reset driver") was added. Add > the judgment condition to avoid errors when calling reset_control_status > on JH7110 SoC. > > Fixes: 82327b127d41 ("reset: starfive: Add StarFive JH7110 reset driver") > Signed-off-by: Changhuang Liang <changhuang.liang@starfivetech.com> > Acked-by: Hal Feng <hal.feng@starfivetech.com> > Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> Applied to reset/fixes, thanks! [1/1] reset: starfive: jh71x0: Fix accessing the empty member on JH7110 SoC https://git.pengutronix.de/cgit/pza/linux/commit/?id=2cf596636607 regards Philipp
diff --git a/drivers/reset/starfive/reset-starfive-jh71x0.c b/drivers/reset/starfive/reset-starfive-jh71x0.c index 55bbbd2de52c..29ce3486752f 100644 --- a/drivers/reset/starfive/reset-starfive-jh71x0.c +++ b/drivers/reset/starfive/reset-starfive-jh71x0.c @@ -94,6 +94,9 @@ static int jh71x0_reset_status(struct reset_controller_dev *rcdev, void __iomem *reg_status = data->status + offset * sizeof(u32); u32 value = readl(reg_status); + if (!data->asserted) + return !(value & mask); + return !((value ^ data->asserted[offset]) & mask); }
data->asserted will be NULL on JH7110 SoC since commit 82327b127d41 ("reset: starfive: Add StarFive JH7110 reset driver") was added. Add the judgment condition to avoid errors when calling reset_control_status on JH7110 SoC. Fixes: 82327b127d41 ("reset: starfive: Add StarFive JH7110 reset driver") Signed-off-by: Changhuang Liang <changhuang.liang@starfivetech.com> Acked-by: Hal Feng <hal.feng@starfivetech.com> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> --- Add Fixes. drivers/reset/starfive/reset-starfive-jh71x0.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.25.1