git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/soundcore-preclaim' into for-linus
[pandora-kernel.git]
/
drivers
/
mtd
/
mtdcore.c
diff --git
a/drivers/mtd/mtdcore.c
b/drivers/mtd/mtdcore.c
index
fac54a3
..
00ebf7a
100644
(file)
--- a/
drivers/mtd/mtdcore.c
+++ b/
drivers/mtd/mtdcore.c
@@
-65,8
+65,8
@@
static void mtd_release(struct device *dev)
static int mtd_cls_suspend(struct device *dev, pm_message_t state)
{
struct mtd_info *mtd = dev_to_mtd(dev);
static int mtd_cls_suspend(struct device *dev, pm_message_t state)
{
struct mtd_info *mtd = dev_to_mtd(dev);
-
- if (mtd->suspend)
+
+ if (mtd
&& mtd
->suspend)
return mtd->suspend(mtd);
else
return 0;
return mtd->suspend(mtd);
else
return 0;
@@
-76,7
+76,7
@@
static int mtd_cls_resume(struct device *dev)
{
struct mtd_info *mtd = dev_to_mtd(dev);
{
struct mtd_info *mtd = dev_to_mtd(dev);
- if (mtd->resume)
+ if (mtd
&& mtd
->resume)
mtd->resume(mtd);
return 0;
}
mtd->resume(mtd);
return 0;
}
@@
-298,6
+298,7
@@
int add_mtd_device(struct mtd_info *mtd)
mtd->dev.class = &mtd_class;
mtd->dev.devt = MTD_DEVT(i);
dev_set_name(&mtd->dev, "mtd%d", i);
mtd->dev.class = &mtd_class;
mtd->dev.devt = MTD_DEVT(i);
dev_set_name(&mtd->dev, "mtd%d", i);
+ dev_set_drvdata(&mtd->dev, mtd);
if (device_register(&mtd->dev) != 0) {
mtd_table[i] = NULL;
break;
if (device_register(&mtd->dev) != 0) {
mtd_table[i] = NULL;
break;