diff options
| author | Kulikov Vasiliy <segooon@gmail.com> | 2010-08-06 23:53:23 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-31 14:48:09 -0700 |
| commit | 918e3592b9ea865ce29bda06a7200eba80d8d5f8 (patch) | |
| tree | 3a24139502b5d5788265b581d762bcbaaa3fd625 /drivers/staging/sm7xx | |
| parent | 3a8f2d3c716a218f1499041d74edb07638b45559 (diff) | |
staging: sm7xx: call disable_pci_device() if pci_probe() failed
Driver should call disable_pci_device() if it returns from pci_probe()
with error.
Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/sm7xx')
| -rw-r--r-- | drivers/staging/sm7xx/smtcfb.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/staging/sm7xx/smtcfb.c b/drivers/staging/sm7xx/smtcfb.c index f6b401c0ccc9..24f47d6388f4 100644 --- a/drivers/staging/sm7xx/smtcfb.c +++ b/drivers/staging/sm7xx/smtcfb.c @@ -848,7 +848,6 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev, "Silicon Motion display driver " SMTC_LINUX_FB_VERSION "\n"); err = pci_enable_device(pdev); /* enable SMTC chip */ - if (err) return err; err = -ENOMEM; @@ -859,7 +858,7 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev, sfb = smtc_alloc_fb_info(pdev, name); if (!sfb) - goto failed; + goto failed_free; /* Jason (08/13/2009) * Store fb_info to be further used when suspending and resuming */ @@ -917,7 +916,8 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev, printk(KERN_INFO "%s: unable to map memory mapped IO\n", sfb->fb.fix.id); - return -ENOMEM; + err = -ENOMEM; + goto failed_fb; } /* set MCLK = 14.31818 * (0x16 / 0x2) */ @@ -951,8 +951,7 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev, printk(KERN_INFO "No valid Silicon Motion display chip was detected!\n"); - smtc_free_fb_info(sfb); - return err; + goto failed_fb; } /* can support 32 bpp */ @@ -986,8 +985,12 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev, smtc_unmap_smem(sfb); smtc_unmap_mmio(sfb); +failed_fb: smtc_free_fb_info(sfb); +failed_free: + pci_disable_device(pdev); + return err; } |