Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afc4bca6 authored by Michael Hennerich's avatar Michael Hennerich Committed by David Woodhouse
Browse files

[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: default avatarMichael Hennerich <michael.hennerich@analog.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent 2314488e

drivers/mtd/nand/bf5xx_nand.c

+8 −8
Original line number Diff line number Diff line 
/* linux/drivers/mtd/nand/bf5xx_nand.c

 *

 * Copyright 2006-2007 Analog Devices Inc.

 * Copyright 2006-2008 Analog Devices Inc.

 *	http://blackfin.uclinux.org/

 *	Bryan Wu <bryan.wu@analog.com>

 *
@@ -74,7 +74,7 @@ static int hardware_ecc = 1; 
static int hardware_ecc;

#endif



static unsigned short bfin_nfc_pin_req[] =

static const unsigned short bfin_nfc_pin_req[] =

	{P_NAND_CE,

	 P_NAND_RB,

	 P_NAND_D0,
@@ -581,12 +581,6 @@ static int bf5xx_nand_hw_init(struct bf5xx_nand_info *info) 
	bfin_write_NFC_IRQSTAT(val);

	SSYNC();



	if (peripheral_request_list(bfin_nfc_pin_req, DRV_NAME)) {

		printk(KERN_ERR DRV_NAME

		": Requesting Peripherals failed\n");

		return -EFAULT;

	}



	/* DMA initialization  */

	if (bf5xx_nand_dma_init(info))

		err = -ENXIO;
@@ -654,6 +648,12 @@ static int bf5xx_nand_probe(struct platform_device *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) {

		dev_err(&pdev->dev, "no platform specific information\n");

		goto exit_error;