summaryrefslogtreecommitdiff
path: root/drivers/mtd/nand/r852.c
diff options
context:
space:
mode:
authorMaxim Levitsky <maximlevitsky@gmail.com>2010-04-19 19:20:41 +0400
committerDavid Woodhouse <David.Woodhouse@intel.com>2010-05-14 04:03:46 +0400
commitc3611570ddf601609f8803574ea83889ff969aa0 (patch)
tree43e0aa84df91365b2bc5c484da1342d83bda9137 /drivers/mtd/nand/r852.c
parenta47bfd2eb66837653dc3b42541dfe4283dd41251 (diff)
downloadlinux-c3611570ddf601609f8803574ea83889ff969aa0.tar.xz
mtd: sm_common: split smartmedia and xD table
2GB xD card, and 4MB SmartMedia ROM card share same ID, so to make both work split xD and smartmedia ID tables. Hardware driver must be able to know which type it handles (and probably just one). Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/nand/r852.c')
-rw-r--r--drivers/mtd/nand/r852.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/r852.c b/drivers/mtd/nand/r852.c
index 96bfbd8e8fdb..6dfbb4713162 100644
--- a/drivers/mtd/nand/r852.c
+++ b/drivers/mtd/nand/r852.c
@@ -666,7 +666,7 @@ int r852_register_nand_device(struct r852_device *dev)
r852_engine_enable(dev);
- if (sm_register_device(dev->mtd))
+ if (sm_register_device(dev->mtd, dev->sm))
goto error2;
if (device_create_file(&dev->mtd->dev, &dev_attr_media_type))