mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

[MTD] [NAND] Blackfin NFC Driver: Cleanup the error exit path of bf5xx_nand_probe function 

Signed-off-by: Bryan Wu <cooloney@kernel.org>
Cc: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Bryan Wu 2008-07-30 12:35:04 -07:00 committed by David Woodhouse
parent 0ee002b041
commit 4f0ca70e52
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/mtd/nand/bf5xx_nand.c
View File

@ -549,7 +549,6 @@ static void bf5xx_nand_dma_write_buf(struct mtd_info *mtd,
/* /*
* System initialization functions * System initialization functions
*/ */
static int bf5xx_nand_dma_init(struct bf5xx_nand_info *info) static int bf5xx_nand_dma_init(struct bf5xx_nand_info *info)
{ {
int ret; int ret;
@ -582,6 +581,13 @@ static int bf5xx_nand_dma_init(struct bf5xx_nand_info *info)
return 0; return 0;
} }
static void bf5xx_nand_dma_remove(struct bf5xx_nand_info *info)
{
/* Free NFC DMA channel */
if (hardware_ecc)
free_dma(CH_NFC);
}
/* /*
* BF5XX NFC hardware initialization * BF5XX NFC hardware initialization
* - pin mux setup * - pin mux setup
@ -658,6 +664,7 @@ static int __devexit bf5xx_nand_remove(struct platform_device *pdev)
} }
peripheral_free_list(bfin_nfc_pin_req); peripheral_free_list(bfin_nfc_pin_req);
bf5xx_nand_dma_remove(info);
/* free the common resources */ /* free the common resources */
kfree(info); kfree(info);
@ -683,21 +690,21 @@ static int __devinit bf5xx_nand_probe(struct platform_device *pdev)
dev_dbg(&pdev->dev, "(%p)\n", pdev); dev_dbg(&pdev->dev, "(%p)\n", pdev);
if (!plat) {
dev_err(&pdev->dev, "no platform specific information\n");
return -EINVAL;
}
if (peripheral_request_list(bfin_nfc_pin_req, DRV_NAME)) { if (peripheral_request_list(bfin_nfc_pin_req, DRV_NAME)) {
dev_err(&pdev->dev, "requesting Peripherals failed\n"); dev_err(&pdev->dev, "requesting Peripherals failed\n");
return -EFAULT; return -EFAULT;
} }
if (!plat) {
dev_err(&pdev->dev, "no platform specific information\n");
goto exit_error;
}
info = kzalloc(sizeof(*info), GFP_KERNEL); info = kzalloc(sizeof(*info), GFP_KERNEL);
if (info == NULL) { if (info == NULL) {
dev_err(&pdev->dev, "no memory for flash info\n"); dev_err(&pdev->dev, "no memory for flash info\n");
err = -ENOMEM; err = -ENOMEM;
goto exit_error; goto out_err_kzalloc;
} }
platform_set_drvdata(pdev, info); platform_set_drvdata(pdev, info);
@ -741,8 +748,8 @@ static int __devinit bf5xx_nand_probe(struct platform_device *pdev)
/* initialise the hardware */ /* initialise the hardware */
err = bf5xx_nand_hw_init(info); err = bf5xx_nand_hw_init(info);
if (err != 0) if (err)
goto exit_error; goto out_err_hw_init;
/* setup hardware ECC data struct */ /* setup hardware ECC data struct */
if (hardware_ecc) { if (hardware_ecc) {
@ -772,7 +779,7 @@ static int __devinit bf5xx_nand_probe(struct platform_device *pdev)
/* scan hardware nand chip and setup mtd info data struct */ /* scan hardware nand chip and setup mtd info data struct */
if (nand_scan(mtd, 1)) { if (nand_scan(mtd, 1)) {
err = -ENXIO; err = -ENXIO;
goto exit_error; goto out_err_nand_scan;
} }
/* add NAND partition */ /* add NAND partition */
@ -781,11 +788,14 @@ static int __devinit bf5xx_nand_probe(struct platform_device *pdev)
dev_dbg(&pdev->dev, "initialised ok\n"); dev_dbg(&pdev->dev, "initialised ok\n");
return 0; return 0;
exit_error: out_err_nand_scan:
bf5xx_nand_remove(pdev); bf5xx_nand_dma_remove(info);
out_err_hw_init:
platform_set_drvdata(pdev, NULL);
kfree(info);
out_err_kzalloc:
peripheral_free_list(bfin_nfc_pin_req);
if (err == 0)
err = -EINVAL;
return err; return err;
} }