diff mbox series

drivers: rtc: fix null pointer access in armada38x_rtc_reset

Message ID HE1P192MB00098AD6AEE64208FB703848DA019@HE1P192MB0009.EURP192.PROD.OUTLOOK.COM
State Accepted
Commit 2454de2c34531941756d259771fd0266ea2d5d0b
Delegated to: Stefan Roese
Headers show
Series drivers: rtc: fix null pointer access in armada38x_rtc_reset | expand

Commit Message

Francois Berder Feb. 28, 2022, 9:31 a.m. UTC
From: Francois Berder <fberder@outlook.fr>

Replace null pointer by pointer to device registers when calling
armada38x_rtc_write.

Signed-off-by: Francois Berder <fberder@outlook.fr>
---

 drivers/rtc/armada38x.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Stefan Roese March 4, 2022, 7:36 a.m. UTC | #1
On 2/28/22 10:31, fberder@outlook.fr wrote:
> From: Francois Berder <fberder@outlook.fr>
> 
> Replace null pointer by pointer to device registers when calling
> armada38x_rtc_write.
> 
> Signed-off-by: Francois Berder <fberder@outlook.fr>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan


> ---
> 
>   drivers/rtc/armada38x.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/rtc/armada38x.c b/drivers/rtc/armada38x.c
> index 2d264acf77..2af64e3912 100644
> --- a/drivers/rtc/armada38x.c
> +++ b/drivers/rtc/armada38x.c
> @@ -121,7 +121,7 @@ static int armada38x_rtc_reset(struct udevice *dev)
>   		armada38x_rtc_write(0, rtc, RTC_CONF_TEST);
>   		mdelay(500);
>   		armada38x_rtc_write(0, rtc, RTC_TIME);
> -		armada38x_rtc_write(BIT(0) | BIT(1), 0, RTC_STATUS);
> +		armada38x_rtc_write(BIT(0) | BIT(1), rtc, RTC_STATUS);
>   	}
>   
>   	return 0;

Viele Grüße,
Stefan Roese
Stefan Roese March 4, 2022, 12:23 p.m. UTC | #2
On 2/28/22 10:31, fberder@outlook.fr wrote:
> From: Francois Berder <fberder@outlook.fr>
> 
> Replace null pointer by pointer to device registers when calling
> armada38x_rtc_write.
> 
> Signed-off-by: Francois Berder <fberder@outlook.fr>

Applied to u-boot-marvell/master

Thanks,
Stefan

> ---
> 
>   drivers/rtc/armada38x.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/rtc/armada38x.c b/drivers/rtc/armada38x.c
> index 2d264acf77..2af64e3912 100644
> --- a/drivers/rtc/armada38x.c
> +++ b/drivers/rtc/armada38x.c
> @@ -121,7 +121,7 @@ static int armada38x_rtc_reset(struct udevice *dev)
>   		armada38x_rtc_write(0, rtc, RTC_CONF_TEST);
>   		mdelay(500);
>   		armada38x_rtc_write(0, rtc, RTC_TIME);
> -		armada38x_rtc_write(BIT(0) | BIT(1), 0, RTC_STATUS);
> +		armada38x_rtc_write(BIT(0) | BIT(1), rtc, RTC_STATUS);
>   	}
>   
>   	return 0;

Viele Grüße,
Stefan Roese
diff mbox series

Patch

diff --git a/drivers/rtc/armada38x.c b/drivers/rtc/armada38x.c
index 2d264acf77..2af64e3912 100644
--- a/drivers/rtc/armada38x.c
+++ b/drivers/rtc/armada38x.c
@@ -121,7 +121,7 @@  static int armada38x_rtc_reset(struct udevice *dev)
 		armada38x_rtc_write(0, rtc, RTC_CONF_TEST);
 		mdelay(500);
 		armada38x_rtc_write(0, rtc, RTC_TIME);
-		armada38x_rtc_write(BIT(0) | BIT(1), 0, RTC_STATUS);
+		armada38x_rtc_write(BIT(0) | BIT(1), rtc, RTC_STATUS);
 	}
 
 	return 0;