* [PATCH 1/2] drm/imagination: Fix error codes in pvr_device_clk_init()
@ 2023-11-30 7:26 Dan Carpenter
2023-11-30 7:27 ` [PATCH 2/2] drm/imagination: Fix IS_ERR() vs NULL bug in pvr_request_firmware() Dan Carpenter
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Dan Carpenter @ 2023-11-30 7:26 UTC (permalink / raw)
To: Sarah Walker
Cc: Frank Binns, Donald Robson, Matt Coster, Maarten Lankhorst,
Maxime Ripard, Thomas Zimmermann, David Airlie, Daniel Vetter,
dri-devel, linux-kernel, kernel-janitors
There is a cut and paste error so this code returns the wrong variable.
Fixes: 1f88f017e649 ("drm/imagination: Get GPU resources")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
drivers/gpu/drm/imagination/pvr_device.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/imagination/pvr_device.c b/drivers/gpu/drm/imagination/pvr_device.c
index 8499becf4fbb..e1dcc4e42087 100644
--- a/drivers/gpu/drm/imagination/pvr_device.c
+++ b/drivers/gpu/drm/imagination/pvr_device.c
@@ -105,12 +105,12 @@ static int pvr_device_clk_init(struct pvr_device *pvr_dev)
sys_clk = devm_clk_get_optional(drm_dev->dev, "sys");
if (IS_ERR(sys_clk))
- return dev_err_probe(drm_dev->dev, PTR_ERR(core_clk),
+ return dev_err_probe(drm_dev->dev, PTR_ERR(sys_clk),
"failed to get sys clock\n");
mem_clk = devm_clk_get_optional(drm_dev->dev, "mem");
if (IS_ERR(mem_clk))
- return dev_err_probe(drm_dev->dev, PTR_ERR(core_clk),
+ return dev_err_probe(drm_dev->dev, PTR_ERR(mem_clk),
"failed to get mem clock\n");
pvr_dev->core_clk = core_clk;
--
2.42.0
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 2/2] drm/imagination: Fix IS_ERR() vs NULL bug in pvr_request_firmware()
2023-11-30 7:26 [PATCH 1/2] drm/imagination: Fix error codes in pvr_device_clk_init() Dan Carpenter
@ 2023-11-30 7:27 ` Dan Carpenter
2023-11-30 9:09 ` Frank Binns
2023-11-30 9:18 ` (subset) " Maxime Ripard
2023-11-30 9:09 ` [PATCH 1/2] drm/imagination: Fix error codes in pvr_device_clk_init() Frank Binns
2023-11-30 9:18 ` (subset) " Maxime Ripard
2 siblings, 2 replies; 6+ messages in thread
From: Dan Carpenter @ 2023-11-30 7:27 UTC (permalink / raw)
To: Sarah Walker
Cc: Frank Binns, Donald Robson, Matt Coster, Maarten Lankhorst,
Maxime Ripard, Thomas Zimmermann, David Airlie, Daniel Vetter,
dri-devel, linux-kernel, kernel-janitors
The pvr_build_firmware_filename() function returns NULL on error. It
doesn't return error pointers.
Fixes: f99f5f3ea7ef ("drm/imagination: Add GPU ID parsing and firmware loading")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
drivers/gpu/drm/imagination/pvr_device.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/imagination/pvr_device.c b/drivers/gpu/drm/imagination/pvr_device.c
index e1dcc4e42087..5389aea7ff21 100644
--- a/drivers/gpu/drm/imagination/pvr_device.c
+++ b/drivers/gpu/drm/imagination/pvr_device.c
@@ -286,8 +286,8 @@ pvr_request_firmware(struct pvr_device *pvr_dev)
filename = pvr_build_firmware_filename(pvr_dev, "powervr/rogue",
PVR_FW_VERSION_MAJOR);
- if (IS_ERR(filename))
- return PTR_ERR(filename);
+ if (!filename)
+ return -ENOMEM;
/*
* This function takes a copy of &filename, meaning we can free our
--
2.42.0
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 2/2] drm/imagination: Fix IS_ERR() vs NULL bug in pvr_request_firmware()
2023-11-30 7:27 ` [PATCH 2/2] drm/imagination: Fix IS_ERR() vs NULL bug in pvr_request_firmware() Dan Carpenter
@ 2023-11-30 9:09 ` Frank Binns
2023-11-30 9:18 ` (subset) " Maxime Ripard
1 sibling, 0 replies; 6+ messages in thread
From: Frank Binns @ 2023-11-30 9:09 UTC (permalink / raw)
To: dan.carpenter, Sarah Walker
Cc: kernel-janitors, tzimmermann, Donald Robson, Matt Coster,
dri-devel, airlied, linux-kernel, maarten.lankhorst, daniel,
mripard
On Thu, 2023-11-30 at 10:27 +0300, Dan Carpenter wrote:
> The pvr_build_firmware_filename() function returns NULL on error. It
> doesn't return error pointers.
>
> Fixes: f99f5f3ea7ef ("drm/imagination: Add GPU ID parsing and firmware loading")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: Frank Binns <frank.binns@imgtec.com>
> ---
> drivers/gpu/drm/imagination/pvr_device.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/imagination/pvr_device.c b/drivers/gpu/drm/imagination/pvr_device.c
> index e1dcc4e42087..5389aea7ff21 100644
> --- a/drivers/gpu/drm/imagination/pvr_device.c
> +++ b/drivers/gpu/drm/imagination/pvr_device.c
> @@ -286,8 +286,8 @@ pvr_request_firmware(struct pvr_device *pvr_dev)
>
> filename = pvr_build_firmware_filename(pvr_dev, "powervr/rogue",
> PVR_FW_VERSION_MAJOR);
> - if (IS_ERR(filename))
> - return PTR_ERR(filename);
> + if (!filename)
> + return -ENOMEM;
>
> /*
> * This function takes a copy of &filename, meaning we can free our
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: (subset) [PATCH 2/2] drm/imagination: Fix IS_ERR() vs NULL bug in pvr_request_firmware()
2023-11-30 7:27 ` [PATCH 2/2] drm/imagination: Fix IS_ERR() vs NULL bug in pvr_request_firmware() Dan Carpenter
2023-11-30 9:09 ` Frank Binns
@ 2023-11-30 9:18 ` Maxime Ripard
1 sibling, 0 replies; 6+ messages in thread
From: Maxime Ripard @ 2023-11-30 9:18 UTC (permalink / raw)
To: Sarah Walker, Dan Carpenter
Cc: Frank Binns, Donald Robson, Matt Coster, Maarten Lankhorst,
Thomas Zimmermann, David Airlie, Daniel Vetter, dri-devel,
linux-kernel, kernel-janitors
On Thu, 30 Nov 2023 10:27:01 +0300, Dan Carpenter wrote:
> The pvr_build_firmware_filename() function returns NULL on error. It
> doesn't return error pointers.
>
>
Applied to drm/drm-misc (drm-misc-next).
Thanks!
Maxime
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] drm/imagination: Fix error codes in pvr_device_clk_init()
2023-11-30 7:26 [PATCH 1/2] drm/imagination: Fix error codes in pvr_device_clk_init() Dan Carpenter
2023-11-30 7:27 ` [PATCH 2/2] drm/imagination: Fix IS_ERR() vs NULL bug in pvr_request_firmware() Dan Carpenter
@ 2023-11-30 9:09 ` Frank Binns
2023-11-30 9:18 ` (subset) " Maxime Ripard
2 siblings, 0 replies; 6+ messages in thread
From: Frank Binns @ 2023-11-30 9:09 UTC (permalink / raw)
To: dan.carpenter, Sarah Walker
Cc: kernel-janitors, tzimmermann, Donald Robson, Matt Coster,
dri-devel, airlied, linux-kernel, maarten.lankhorst, daniel,
mripard
Hi,
Thank you for the patches.
On Thu, 2023-11-30 at 10:26 +0300, Dan Carpenter wrote:
> There is a cut and paste error so this code returns the wrong variable.
>
> Fixes: 1f88f017e649 ("drm/imagination: Get GPU resources")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: Frank Binns <frank.binns@imgtec.com>
> ---
> drivers/gpu/drm/imagination/pvr_device.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/imagination/pvr_device.c b/drivers/gpu/drm/imagination/pvr_device.c
> index 8499becf4fbb..e1dcc4e42087 100644
> --- a/drivers/gpu/drm/imagination/pvr_device.c
> +++ b/drivers/gpu/drm/imagination/pvr_device.c
> @@ -105,12 +105,12 @@ static int pvr_device_clk_init(struct pvr_device *pvr_dev)
>
> sys_clk = devm_clk_get_optional(drm_dev->dev, "sys");
> if (IS_ERR(sys_clk))
> - return dev_err_probe(drm_dev->dev, PTR_ERR(core_clk),
> + return dev_err_probe(drm_dev->dev, PTR_ERR(sys_clk),
> "failed to get sys clock\n");
>
> mem_clk = devm_clk_get_optional(drm_dev->dev, "mem");
> if (IS_ERR(mem_clk))
> - return dev_err_probe(drm_dev->dev, PTR_ERR(core_clk),
> + return dev_err_probe(drm_dev->dev, PTR_ERR(mem_clk),
> "failed to get mem clock\n");
>
> pvr_dev->core_clk = core_clk;
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: (subset) [PATCH 1/2] drm/imagination: Fix error codes in pvr_device_clk_init()
2023-11-30 7:26 [PATCH 1/2] drm/imagination: Fix error codes in pvr_device_clk_init() Dan Carpenter
2023-11-30 7:27 ` [PATCH 2/2] drm/imagination: Fix IS_ERR() vs NULL bug in pvr_request_firmware() Dan Carpenter
2023-11-30 9:09 ` [PATCH 1/2] drm/imagination: Fix error codes in pvr_device_clk_init() Frank Binns
@ 2023-11-30 9:18 ` Maxime Ripard
2 siblings, 0 replies; 6+ messages in thread
From: Maxime Ripard @ 2023-11-30 9:18 UTC (permalink / raw)
To: Sarah Walker, Dan Carpenter
Cc: Frank Binns, Donald Robson, Matt Coster, Maarten Lankhorst,
Thomas Zimmermann, David Airlie, Daniel Vetter, dri-devel,
linux-kernel, kernel-janitors
On Thu, 30 Nov 2023 10:26:29 +0300, Dan Carpenter wrote:
> There is a cut and paste error so this code returns the wrong variable.
>
>
Applied to drm/drm-misc (drm-misc-next).
Thanks!
Maxime
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-11-30 9:18 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-30 7:26 [PATCH 1/2] drm/imagination: Fix error codes in pvr_device_clk_init() Dan Carpenter
2023-11-30 7:27 ` [PATCH 2/2] drm/imagination: Fix IS_ERR() vs NULL bug in pvr_request_firmware() Dan Carpenter
2023-11-30 9:09 ` Frank Binns
2023-11-30 9:18 ` (subset) " Maxime Ripard
2023-11-30 9:09 ` [PATCH 1/2] drm/imagination: Fix error codes in pvr_device_clk_init() Frank Binns
2023-11-30 9:18 ` (subset) " Maxime Ripard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®