From 07c5ac71a19bbbf4ca507557638a1c47edea10ea Mon Sep 17 00:00:00 2001 From: Vimal Singh Date: Tue, 5 Jan 2010 16:01:08 +0530 Subject: [PATCH] --- yaml --- r: 195882 b: refs/heads/master c: f35b6eda5184e46bf2393d8970b4b9498daf7bcf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/omap2.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ab19444900dd..28611e1fa4ee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bdaefc41627b6f2815ef7aa476dfa4ebb3ad499f +refs/heads/master: f35b6eda5184e46bf2393d8970b4b9498daf7bcf diff --git a/trunk/drivers/mtd/nand/omap2.c b/trunk/drivers/mtd/nand/omap2.c index 4eea97c03b2b..16120e2dd4a3 100644 --- a/trunk/drivers/mtd/nand/omap2.c +++ b/trunk/drivers/mtd/nand/omap2.c @@ -1054,7 +1054,8 @@ static int __devinit omap_nand_probe(struct platform_device *pdev) static int omap_nand_remove(struct platform_device *pdev) { struct mtd_info *mtd = platform_get_drvdata(pdev); - struct omap_nand_info *info = mtd->priv; + struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, + mtd); platform_set_drvdata(pdev, NULL); if (use_dma)