← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/mtd/nand/nomadik_nand.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/mtd/nand/nomadik_nand.c
151
151
        nand->options = pdata->options;
152
152
 
153
153
        /*
154
 
         * Scan to find existance of the device
 
154
         * Scan to find existence of the device
155
155
         */
156
156
        if (nand_scan(&host->mtd, 1)) {
157
157
                ret = -ENXIO;
158
158
                goto err_unmap;
159
159
        }
160
160
 
161
 
#ifdef CONFIG_MTD_PARTITIONS
162
 
        add_mtd_partitions(&host->mtd, pdata->parts, pdata->nparts);
163
 
#else
164
 
        pr_info("Registering %s as whole device\n", mtd->name);
165
 
        add_mtd_device(mtd);
166
 
#endif
 
161
        mtd_device_register(&host->mtd, pdata->parts, pdata->nparts);
167
162
 
168
163
        platform_set_drvdata(pdev, host);
169
164
        return 0;