aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/orion_nand.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mtd/nand/orion_nand.c')
-rw-r--r--drivers/mtd/nand/orion_nand.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c
index 8fbd00208610..a393a5b6ce1e 100644
--- a/drivers/mtd/nand/orion_nand.c
+++ b/drivers/mtd/nand/orion_nand.c
@@ -130,8 +130,9 @@ static int __init orion_nand_probe(struct platform_device *pdev)
130 if (!of_property_read_u32(pdev->dev.of_node, 130 if (!of_property_read_u32(pdev->dev.of_node,
131 "chip-delay", &val)) 131 "chip-delay", &val))
132 board->chip_delay = (u8)val; 132 board->chip_delay = (u8)val;
133 } else 133 } else {
134 board = pdev->dev.platform_data; 134 board = dev_get_platdata(&pdev->dev);
135 }
135 136
136 mtd->priv = nc; 137 mtd->priv = nc;
137 mtd->owner = THIS_MODULE; 138 mtd->owner = THIS_MODULE;
@@ -186,7 +187,6 @@ no_dev:
186 clk_disable_unprepare(clk); 187 clk_disable_unprepare(clk);
187 clk_put(clk); 188 clk_put(clk);
188 } 189 }
189 platform_set_drvdata(pdev, NULL);
190 iounmap(io_base); 190 iounmap(io_base);
191no_res: 191no_res:
192 kfree(nc); 192 kfree(nc);