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

[MTD] [NAND] bf5xx_nand: Avoid crash if bfin_mac is installed. 

http://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tracker_item_id=4053

Singed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
This commit is contained in:
Michael Hennerich 2008-04-25 12:07:31 +08:00 committed by David Woodhouse
parent 2314488e81
commit afc4bca639
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
/* linux/drivers/mtd/nand/bf5xx_nand.c /* linux/drivers/mtd/nand/bf5xx_nand.c
* *
* Copyright 2006-2007 Analog Devices Inc. * Copyright 2006-2008 Analog Devices Inc.
* http://blackfin.uclinux.org/ * http://blackfin.uclinux.org/
* Bryan Wu <bryan.wu@analog.com> * Bryan Wu <bryan.wu@analog.com>
* *
@ -74,7 +74,7 @@ static int hardware_ecc = 1;
static int hardware_ecc; static int hardware_ecc;
#endif #endif
static unsigned short bfin_nfc_pin_req[] = static const unsigned short bfin_nfc_pin_req[] =
{P_NAND_CE, {P_NAND_CE,
P_NAND_RB, P_NAND_RB,
P_NAND_D0, P_NAND_D0,
@ -581,12 +581,6 @@ static int bf5xx_nand_hw_init(struct bf5xx_nand_info *info)
bfin_write_NFC_IRQSTAT(val); bfin_write_NFC_IRQSTAT(val);
SSYNC(); SSYNC();
if (peripheral_request_list(bfin_nfc_pin_req, DRV_NAME)) {
printk(KERN_ERR DRV_NAME
": Requesting Peripherals failed\n");
return -EFAULT;
}
/* DMA initialization */ /* DMA initialization */
if (bf5xx_nand_dma_init(info)) if (bf5xx_nand_dma_init(info))
err = -ENXIO; err = -ENXIO;
@ -654,6 +648,12 @@ static int bf5xx_nand_probe(struct platform_device *pdev)
dev_dbg(&pdev->dev, "(%p)\n", pdev); dev_dbg(&pdev->dev, "(%p)\n", pdev);
if (peripheral_request_list(bfin_nfc_pin_req, DRV_NAME)) {
printk(KERN_ERR DRV_NAME
": Requesting Peripherals failed\n");
return -EFAULT;
}
if (!plat) { if (!plat) {
dev_err(&pdev->dev, "no platform specific information\n"); dev_err(&pdev->dev, "no platform specific information\n");
goto exit_error; goto exit_error;