summaryrefslogtreecommitdiff
path: root/drivers/mtd/nand/r852.c
diff options
context:
space:
mode:
authorMaxim Levitsky <maximlevitsky@gmail.com>2010-02-26 23:08:40 +0300
committerDavid Woodhouse <David.Woodhouse@intel.com>2010-02-26 23:13:49 +0300
commit133fa8c7d70d16b07db3a3d87ea18291db8f8ebf (patch)
tree0a5a8ab311a46dbfd8cb3f90dce98adafc6c8473 /drivers/mtd/nand/r852.c
parent67e054e919248fa1db93de727fb9ad49eb700642 (diff)
downloadlinux-133fa8c7d70d16b07db3a3d87ea18291db8f8ebf.tar.xz
mtd: Few follow up cleanups for Smartmedia/xD support
* Test results of few functions that were declared with __must_check * Fix bogus gcc warning about uinitialized variable 'ret' * Remove unused variable from mtdblock_remove_dev * Don't use deprecated DMA_32BIT_MASK 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.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mtd/nand/r852.c b/drivers/mtd/nand/r852.c
index 9307a88e5229..7a616a926ee9 100644
--- a/drivers/mtd/nand/r852.c
+++ b/drivers/mtd/nand/r852.c
@@ -654,7 +654,9 @@ int r852_register_nand_device(struct r852_device *dev)
if (sm_register_device(dev->mtd))
goto error2;
- device_create_file(&dev->mtd->dev, &dev_attr_media_type);
+ if (device_create_file(&dev->mtd->dev, &dev_attr_media_type))
+ message("can't create media type sysfs attribute");
+
dev->card_registred = 1;
return 0;
error2:
@@ -838,7 +840,7 @@ int r852_probe(struct pci_dev *pci_dev, const struct pci_device_id *id)
pci_set_master(pci_dev);
- error = pci_set_dma_mask(pci_dev, DMA_32BIT_MASK);
+ error = pci_set_dma_mask(pci_dev, DMA_BIT_MASK(32));
if (error)
goto error2;