[PATCH v2] fbdev: chipsfb: Fix error codes in chipsfb_pci_init()

[Thomas Zimmermann]

Merged into drm-misc-fixes.

Am 27.02.23 um 11:33 schrieb Dan Carpenter:
> The error codes are not set on these error paths.
> 
> Fixes: 145eed48de27 ("fbdev: Remove conflicting devices on PCI bus")
> Signed-off-by: Dan Carpenter <error27 at gmail.com>
> Reviewed-by: Thomas Zimmermann <tzimmermann at suse.de>
> ---
> v2: I accidentally returned -EINVAL instead -ENODEV.
>      Add Thomas's Reviewed-by tag.
> 
>   drivers/video/fbdev/chipsfb.c | 14 ++++++++++----
>   1 file changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/video/fbdev/chipsfb.c b/drivers/video/fbdev/chipsfb.c
> index cc37ec3f8fc1..7799d52a651f 100644
> --- a/drivers/video/fbdev/chipsfb.c
> +++ b/drivers/video/fbdev/chipsfb.c
> @@ -358,16 +358,21 @@ static int chipsfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
>   	if (rc)
>   		return rc;
>   
> -	if (pci_enable_device(dp) < 0) {
> +	rc = pci_enable_device(dp);
> +	if (rc < 0) {
>   		dev_err(&dp->dev, "Cannot enable PCI device\n");
>   		goto err_out;
>   	}
>   
> -	if ((dp->resource[0].flags & IORESOURCE_MEM) == 0)
> +	if ((dp->resource[0].flags & IORESOURCE_MEM) == 0) {
> +		rc = -ENODEV;
>   		goto err_disable;
> +	}
>   	addr = pci_resource_start(dp, 0);
> -	if (addr == 0)
> +	if (addr == 0) {
> +		rc = -ENODEV;
>   		goto err_disable;
> +	}
>   
>   	p = framebuffer_alloc(0, &dp->dev);
>   	if (p == NULL) {
> @@ -417,7 +422,8 @@ static int chipsfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
>   
>   	init_chips(p, addr);
>   
> -	if (register_framebuffer(p) < 0) {
> +	rc = register_framebuffer(p);
> +	if (rc < 0) {
>   		dev_err(&dp->dev,"C&T 65550 framebuffer failed to register\n");
>   		goto err_unmap;
>   	}

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 840 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20230228/2f2ea481/attachment.sig>