Skip to content

Commit 77bc762

Browse files
error27Thomas Zimmermann
authored andcommitted
fbdev: chipsfb: Fix error codes in chipsfb_pci_init()
The error codes are not set on these error paths. Fixes: 145eed4 ("fbdev: Remove conflicting devices on PCI bus") Signed-off-by: Dan Carpenter <[email protected]> Reviewed-by: Thomas Zimmermann <[email protected]> Signed-off-by: Thomas Zimmermann <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/Y/yG+sm2mhdJeTZW@kili
1 parent ba3be66 commit 77bc762

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

drivers/video/fbdev/chipsfb.c

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -358,16 +358,21 @@ static int chipsfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
358358
if (rc)
359359
return rc;
360360

361-
if (pci_enable_device(dp) < 0) {
361+
rc = pci_enable_device(dp);
362+
if (rc < 0) {
362363
dev_err(&dp->dev, "Cannot enable PCI device\n");
363364
goto err_out;
364365
}
365366

366-
if ((dp->resource[0].flags & IORESOURCE_MEM) == 0)
367+
if ((dp->resource[0].flags & IORESOURCE_MEM) == 0) {
368+
rc = -ENODEV;
367369
goto err_disable;
370+
}
368371
addr = pci_resource_start(dp, 0);
369-
if (addr == 0)
372+
if (addr == 0) {
373+
rc = -ENODEV;
370374
goto err_disable;
375+
}
371376

372377
p = framebuffer_alloc(0, &dp->dev);
373378
if (p == NULL) {
@@ -417,7 +422,8 @@ static int chipsfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
417422

418423
init_chips(p, addr);
419424

420-
if (register_framebuffer(p) < 0) {
425+
rc = register_framebuffer(p);
426+
if (rc < 0) {
421427
dev_err(&dp->dev,"C&T 65550 framebuffer failed to register\n");
422428
goto err_unmap;
423429
}

0 commit comments

Comments
 (0)