The atmel_nand driver was broken by b654a9a46fc2 "mtd: atmel nand: fix gpio missing request". This is a rather helpless attempt to fix this, probably messing up the error handling even further but getting the build to work again, so please treat it as a bug report rather than a fix to be applied.
Without this patch, building any at91 configuration results in: drivers/mtd/nand/atmel_nand.c: In function 'atmel_nand_probe': drivers/mtd/nand/atmel_nand.c:1451:4: error: label 'err_ecc_ioremap' used but not defined Signed-off-by: Arnd Bergmann <[email protected]> Cc: Jean-Christophe PLAGNIOL-VILLARD <[email protected]> Cc: Artem Bityutskiy <[email protected]> --- drivers/mtd/nand/atmel_nand.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index 9144557..eba5b2a 100644 --- a/drivers/mtd/nand/atmel_nand.c +++ b/drivers/mtd/nand/atmel_nand.c @@ -1420,7 +1420,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev) dev_err(&pdev->dev, "can't request rdy gpio %d\n", host->board.rdy_pin); - goto err_ecc_ioremap; + goto err_no_card; } res = gpio_direction_input(host->board.rdy_pin); @@ -1428,7 +1428,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev) dev_err(&pdev->dev, "can't request input direction rdy gpio %d\n", host->board.rdy_pin); - goto err_ecc_ioremap; + goto err_no_card; } nand_chip->dev_ready = atmel_nand_device_ready; @@ -1440,7 +1440,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev) dev_err(&pdev->dev, "can't request enable gpio %d\n", host->board.enable_pin); - goto err_ecc_ioremap; + goto err_no_card; } res = gpio_direction_output(host->board.enable_pin, 1); @@ -1448,7 +1448,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev) dev_err(&pdev->dev, "can't request output direction enable gpio %d\n", host->board.enable_pin); - goto err_ecc_ioremap; + goto err_no_card; } } -- 1.7.10 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
