UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Staging: xgifb: disable pci device if there's an error after enabling it. 

Signed-off-by: Miguel Gómez <magomez@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Miguel Gómez 2012-06-06 16:22:06 +02:00 committed by Greg Kroah-Hartman
parent d049053ef0
commit 05e06036dd
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/xgifb/XGI_main_26.c
View File

@ -1904,7 +1904,7 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
if (reg1 != 0xa1) { /*I/O error */
pr_err("I/O error!!!");
ret = -EIO;
goto error;
goto error_disable;
}
switch (xgifb_info->chip_id) {
@ -1927,7 +1927,7 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
break;
default:
ret = -ENODEV;
goto error;
goto error_disable;
}
pr_info("chipid = %x\n", xgifb_info->chip);
@ -1936,7 +1936,7 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
if (XGIfb_get_dram_size(xgifb_info)) {
pr_err("Fatal error: Unable to determine RAM size.\n");
ret = -ENODEV;
goto error;
goto error_disable;
}
/* Enable PCI_LINEAR_ADDRESSING and MMIO_ENABLE */
@ -1956,7 +1956,7 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
pr_err("Fatal error: Unable to reserve frame buffer memory\n");
pr_err("Is there another framebuffer driver active?\n");
ret = -ENODEV;
goto error;
goto error_disable;
}
if (!request_mem_region(xgifb_info->mmio_base,
@ -2271,6 +2271,8 @@ error_1:
release_mem_region(xgifb_info->mmio_base, xgifb_info->mmio_size);
error_0:
release_mem_region(xgifb_info->video_base, xgifb_info->video_size);
error_disable:
pci_disable_device(pdev);
error:
framebuffer_release(fb_info);
return ret;