From: Yang Yingliang <yangyingliang@huawei.com>
Date: Mon, 24 Oct 2022 14:00:28 +0000 (+0800)
Subject: fbdev: cyber2000fb: fix missing pci_disable_device()
X-Git-Tag: v6.1-rc3~1^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3c6bf6bddc84888c0ce163b09dee0ddd23b5172a;p=users%2Fdwmw2%2Flinux.git

fbdev: cyber2000fb: fix missing pci_disable_device()

Add missing pci_disable_device() in error path of probe() and remove() path.

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Signed-off-by: Helge Deller <deller@gmx.de>
---

diff --git a/drivers/video/fbdev/cyber2000fb.c b/drivers/video/fbdev/cyber2000fb.c
index 585af90a68a5f..31ff1da82c052 100644
--- a/drivers/video/fbdev/cyber2000fb.c
+++ b/drivers/video/fbdev/cyber2000fb.c
@@ -1796,6 +1796,7 @@ failed_ioremap:
 failed_regions:
 	cyberpro_free_fb_info(cfb);
 failed_release:
+	pci_disable_device(dev);
 	return err;
 }
 
@@ -1812,6 +1813,7 @@ static void cyberpro_pci_remove(struct pci_dev *dev)
 			int_cfb_info = NULL;
 
 		pci_release_regions(dev);
+		pci_disable_device(dev);
 	}
 }