diff options
| author | Patrick Turley <patrick.turley@freescale.com> | 2009-08-19 13:41:53 -0500 |
|---|---|---|
| committer | Patrick Turley <patrick.turley@freescale.com> | 2009-08-20 14:03:16 -0500 |
| commit | 57153fe288c3c7f27787b4de195609e62237be16 (patch) | |
| tree | 30aef17f34bfc35350d93804f80bb5d0cd8cf472 | |
| parent | 4a4526ad1f1b16282294ad80569af73279207c05 (diff) | |
ENGR00115700: mxc_nd2 driver panics the kernel when booting on i.MX25
-- drivers/mtd/nand/mxc_nd2.c
Reverted changes to this file for ENGR00103310 in commit:
a9d55053dc8042936cc4fa34153e6e100adba2bc
Signed-off-by: Patrick Turley <patrick.turley@freescale.com>
| -rw-r--r-- | drivers/mtd/nand/mxc_nd2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mtd/nand/mxc_nd2.c b/drivers/mtd/nand/mxc_nd2.c index d3562d8f5db1..6750bff8b0ca 100644 --- a/drivers/mtd/nand/mxc_nd2.c +++ b/drivers/mtd/nand/mxc_nd2.c @@ -1198,10 +1198,6 @@ static int __init mxcnd_probe(struct platform_device *pdev) nfc_axi_base = IO_ADDRESS(NFC_AXI_BASE_ADDR); nfc_ip_base = IO_ADDRESS(NFC_BASE_ADDR); - err = request_irq(MXC_INT_NANDFC, mxc_nfc_irq, 0, "mxc_nd", NULL); - if (err) - goto out; - /* init the nfc */ mxc_nfc_init(); @@ -1250,6 +1246,10 @@ static int __init mxcnd_probe(struct platform_device *pdev) clk_enable(nfc_clk); init_waitqueue_head(&irq_waitq); + err = request_irq(MXC_INT_NANDFC, mxc_nfc_irq, 0, "mxc_nd", NULL); + if (err) { + goto out_1; + } if (hardware_ecc) { this->ecc.read_page = mxc_nand_read_page; |