fbdev: cyber2000fb: fix missing pci_disable_device()

Yang Yingliang · hdeller · commit 3c6bf6bddc84 · 2022-10-27T20:29:59.000+02:00
Add missing pci_disable_device() in error path of probe() and remove() path. Fixes: 1da177e ("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
@@ -1796,6 +1796,7 @@ static int cyberpro_pci_probe(struct pci_dev *dev,
 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);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1796,6 +1796,7 @@ static int cyberpro_pci_probe(struct pci_dev *dev,`
`1796`	`1796`	`failed_regions:`
`1797`	`1797`	`cyberpro_free_fb_info(cfb);`
`1798`	`1798`	`failed_release:`
	`1799`	`+ pci_disable_device(dev);`
`1799`	`1800`	`return err;`
`1800`	`1801`	`}`
`1801`	`1802`
`@@ -1812,6 +1813,7 @@ static void cyberpro_pci_remove(struct pci_dev *dev)`
`1812`	`1813`	`int_cfb_info = NULL;`
`1813`	`1814`
`1814`	`1815`	`pci_release_regions(dev);`
	`1816`	`+ pci_disable_device(dev);`
`1815`	`1817`	`}`
`1816`	`1818`	`}`
`1817`	`1819`