aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2007-07-19 12:54:17 +0000
committerFlorian Fainelli <florian@openwrt.org>2007-07-19 12:54:17 +0000
commit4ec101945cc9a637c908289866258621901da62a (patch)
tree228f0d5aa539fe21fce49a10ba2de075c2ffcdf8
parentdf473141ae955c964f0410ff92ab17ff3759aac7 (diff)
downloadupstream-4ec101945cc9a637c908289866258621901da62a.tar.gz
upstream-4ec101945cc9a637c908289866258621901da62a.tar.bz2
upstream-4ec101945cc9a637c908289866258621901da62a.zip
Put the init flag in the structure
SVN-Revision: 8054
-rw-r--r--target/linux/adm5120-2.6/files/drivers/mtd/nand/rbmipsnand.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/target/linux/adm5120-2.6/files/drivers/mtd/nand/rbmipsnand.c b/target/linux/adm5120-2.6/files/drivers/mtd/nand/rbmipsnand.c
index 1c524d40a8..2e7059d186 100644
--- a/target/linux/adm5120-2.6/files/drivers/mtd/nand/rbmipsnand.c
+++ b/target/linux/adm5120-2.6/files/drivers/mtd/nand/rbmipsnand.c
@@ -67,6 +67,7 @@ struct adm5120_nand_info {
int nr_parts;
struct mtd_partition *parts;
#endif
+ unsigned int init_ok;
};
static int rb100_dev_ready(struct mtd_info *mtd)
@@ -93,11 +94,10 @@ static void rbmips_hwcontrol100(struct mtd_info *mtd, int cmd, unsigned int ctrl
/* when creating the partitions. */
/*========================================================================*/
-static unsigned init_ok = 0;
unsigned get_rbnand_block_size(struct adm5120_nand_info *data)
{
- return init_ok ? data->mtd.writesize : 0;
+ return data->init_ok ? data->mtd.writesize : 0;
}
EXPORT_SYMBOL(get_rbnand_block_size);
@@ -132,6 +132,7 @@ static int rbmips_probe(struct platform_device *pdev)
data->mtd.priv = &data->chip;
data->mtd.owner = THIS_MODULE;
+ data->init_ok = 0;
data->chip.IO_ADDR_R = (unsigned char *)KSEG1ADDR(ADM5120_SRAM1_BASE);
data->chip.IO_ADDR_W = data->chip.IO_ADDR_R;
data->chip.cmd_ctrl = rbmips_hwcontrol100;
@@ -151,7 +152,7 @@ static int rbmips_probe(struct platform_device *pdev)
}
add_mtd_partitions(&data->mtd, partition_info, 2);
- init_ok = 1;
+ data->init_ok = 1;
res = add_mtd_device(&data->mtd);
if (!res)