* [PATCH] drm/sun4i: Fix an error handling path in 'sun4i_drv_bind()'
@ 2018-03-11 23:19 ` Christophe JAILLET
0 siblings, 0 replies; 7+ messages in thread
From: Christophe JAILLET @ 2018-03-11 23:19 UTC (permalink / raw)
To: maxime.ripard, airlied, wens
Cc: dri-devel, linux-arm-kernel, linux-kernel, kernel-janitors,
Christophe JAILLET
Commit 070badfab767 ("drm/sun4i: call drm_vblank_init with correct number
of crtcs") has moved some code without updating the error handling gotos
accordingly.
Branch to the correct label and remove a now unused lablel.
Fixes: 070badfab767 ("drm/sun4i: call drm_vblank_init with correct number of crtcs")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
drivers/gpu/drm/sun4i/sun4i_drv.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c
index 4570da0227b4..d9a71f361b14 100644
--- a/drivers/gpu/drm/sun4i/sun4i_drv.c
+++ b/drivers/gpu/drm/sun4i/sun4i_drv.c
@@ -111,7 +111,7 @@ static int sun4i_drv_bind(struct device *dev)
/* drm_vblank_init calls kcalloc, which can fail */
ret = drm_vblank_init(drm, drm->mode_config.num_crtc);
if (ret)
- goto free_mem_region;
+ goto cleanup_mode_config;
drm->irq_enabled = true;
@@ -139,7 +139,6 @@ static int sun4i_drv_bind(struct device *dev)
sun4i_framebuffer_free(drm);
cleanup_mode_config:
drm_mode_config_cleanup(drm);
-free_mem_region:
of_reserved_mem_device_release(dev);
free_drm:
drm_dev_unref(drm);
--
2.14.1
---
L'absence de virus dans ce courrier électronique a été vérifiée par le logiciel antivirus Avast.
https://www.avast.com/antivirus
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH] drm/sun4i: Fix an error handling path in 'sun4i_drv_bind()'
@ 2018-03-11 23:19 ` Christophe JAILLET
0 siblings, 0 replies; 7+ messages in thread
From: Christophe JAILLET @ 2018-03-11 23:19 UTC (permalink / raw)
To: maxime.ripard, airlied, wens
Cc: dri-devel, linux-arm-kernel, linux-kernel, kernel-janitors,
Christophe JAILLET
Commit 070badfab767 ("drm/sun4i: call drm_vblank_init with correct number
of crtcs") has moved some code without updating the error handling gotos
accordingly.
Branch to the correct label and remove a now unused lablel.
Fixes: 070badfab767 ("drm/sun4i: call drm_vblank_init with correct number of crtcs")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
drivers/gpu/drm/sun4i/sun4i_drv.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c
index 4570da0227b4..d9a71f361b14 100644
--- a/drivers/gpu/drm/sun4i/sun4i_drv.c
+++ b/drivers/gpu/drm/sun4i/sun4i_drv.c
@@ -111,7 +111,7 @@ static int sun4i_drv_bind(struct device *dev)
/* drm_vblank_init calls kcalloc, which can fail */
ret = drm_vblank_init(drm, drm->mode_config.num_crtc);
if (ret)
- goto free_mem_region;
+ goto cleanup_mode_config;
drm->irq_enabled = true;
@@ -139,7 +139,6 @@ static int sun4i_drv_bind(struct device *dev)
sun4i_framebuffer_free(drm);
cleanup_mode_config:
drm_mode_config_cleanup(drm);
-free_mem_region:
of_reserved_mem_device_release(dev);
free_drm:
drm_dev_unref(drm);
--
2.14.1
---
L'absence de virus dans ce courrier électronique a été vérifiée par le logiciel antivirus Avast.
https://www.avast.com/antivirus
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH] drm/sun4i: Fix an error handling path in 'sun4i_drv_bind()'
@ 2018-03-11 23:19 ` Christophe JAILLET
0 siblings, 0 replies; 7+ messages in thread
From: Christophe JAILLET @ 2018-03-11 23:19 UTC (permalink / raw)
To: linux-arm-kernel
Commit 070badfab767 ("drm/sun4i: call drm_vblank_init with correct number
of crtcs") has moved some code without updating the error handling gotos
accordingly.
Branch to the correct label and remove a now unused lablel.
Fixes: 070badfab767 ("drm/sun4i: call drm_vblank_init with correct number of crtcs")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
drivers/gpu/drm/sun4i/sun4i_drv.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c
index 4570da0227b4..d9a71f361b14 100644
--- a/drivers/gpu/drm/sun4i/sun4i_drv.c
+++ b/drivers/gpu/drm/sun4i/sun4i_drv.c
@@ -111,7 +111,7 @@ static int sun4i_drv_bind(struct device *dev)
/* drm_vblank_init calls kcalloc, which can fail */
ret = drm_vblank_init(drm, drm->mode_config.num_crtc);
if (ret)
- goto free_mem_region;
+ goto cleanup_mode_config;
drm->irq_enabled = true;
@@ -139,7 +139,6 @@ static int sun4i_drv_bind(struct device *dev)
sun4i_framebuffer_free(drm);
cleanup_mode_config:
drm_mode_config_cleanup(drm);
-free_mem_region:
of_reserved_mem_device_release(dev);
free_drm:
drm_dev_unref(drm);
--
2.14.1
---
L'absence de virus dans ce courrier ?lectronique a ?t? v?rifi?e par le logiciel antivirus Avast.
https://www.avast.com/antivirus
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/sun4i: Fix an error handling path in 'sun4i_drv_bind()'
2018-03-11 23:19 ` Christophe JAILLET
(?)
(?)
@ 2018-03-12 9:44 ` Maxime Ripard
-1 siblings, 0 replies; 7+ messages in thread
From: Maxime Ripard @ 2018-03-12 9:44 UTC (permalink / raw)
To: Christophe JAILLET
Cc: airlied, wens, dri-devel, linux-arm-kernel, linux-kernel,
kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 611 bytes --]
On Mon, Mar 12, 2018 at 12:19:09AM +0100, Christophe JAILLET wrote:
> Commit 070badfab767 ("drm/sun4i: call drm_vblank_init with correct number
> of crtcs") has moved some code without updating the error handling gotos
> accordingly.
>
> Branch to the correct label and remove a now unused lablel.
>
> Fixes: 070badfab767 ("drm/sun4i: call drm_vblank_init with correct number of crtcs")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Applied, thanks!
Maxime
--
Maxime Ripard, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/sun4i: Fix an error handling path in 'sun4i_drv_bind()'
@ 2018-03-12 9:44 ` Maxime Ripard
0 siblings, 0 replies; 7+ messages in thread
From: Maxime Ripard @ 2018-03-12 9:44 UTC (permalink / raw)
To: Christophe JAILLET
Cc: airlied, kernel-janitors, linux-kernel, dri-devel, wens,
linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 611 bytes --]
On Mon, Mar 12, 2018 at 12:19:09AM +0100, Christophe JAILLET wrote:
> Commit 070badfab767 ("drm/sun4i: call drm_vblank_init with correct number
> of crtcs") has moved some code without updating the error handling gotos
> accordingly.
>
> Branch to the correct label and remove a now unused lablel.
>
> Fixes: 070badfab767 ("drm/sun4i: call drm_vblank_init with correct number of crtcs")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Applied, thanks!
Maxime
--
Maxime Ripard, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] drm/sun4i: Fix an error handling path in 'sun4i_drv_bind()'
@ 2018-03-12 9:44 ` Maxime Ripard
0 siblings, 0 replies; 7+ messages in thread
From: Maxime Ripard @ 2018-03-12 9:44 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Mar 12, 2018 at 12:19:09AM +0100, Christophe JAILLET wrote:
> Commit 070badfab767 ("drm/sun4i: call drm_vblank_init with correct number
> of crtcs") has moved some code without updating the error handling gotos
> accordingly.
>
> Branch to the correct label and remove a now unused lablel.
>
> Fixes: 070badfab767 ("drm/sun4i: call drm_vblank_init with correct number of crtcs")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Applied, thanks!
Maxime
--
Maxime Ripard, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20180312/05212c91/attachment.sig>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/sun4i: Fix an error handling path in 'sun4i_drv_bind()'
@ 2018-03-12 9:44 ` Maxime Ripard
0 siblings, 0 replies; 7+ messages in thread
From: Maxime Ripard @ 2018-03-12 9:44 UTC (permalink / raw)
To: Christophe JAILLET
Cc: airlied, kernel-janitors, linux-kernel, dri-devel, wens,
linux-arm-kernel
[-- Attachment #1.1: Type: text/plain, Size: 611 bytes --]
On Mon, Mar 12, 2018 at 12:19:09AM +0100, Christophe JAILLET wrote:
> Commit 070badfab767 ("drm/sun4i: call drm_vblank_init with correct number
> of crtcs") has moved some code without updating the error handling gotos
> accordingly.
>
> Branch to the correct label and remove a now unused lablel.
>
> Fixes: 070badfab767 ("drm/sun4i: call drm_vblank_init with correct number of crtcs")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Applied, thanks!
Maxime
--
Maxime Ripard, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2018-03-12 9:44 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-11 23:19 [PATCH] drm/sun4i: Fix an error handling path in 'sun4i_drv_bind()' Christophe JAILLET
2018-03-11 23:19 ` Christophe JAILLET
2018-03-11 23:19 ` Christophe JAILLET
2018-03-12 9:44 ` Maxime Ripard
2018-03-12 9:44 ` Maxime Ripard
2018-03-12 9:44 ` Maxime Ripard
2018-03-12 9:44 ` Maxime Ripard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.