← Back to branch summary

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

« back to all changes in this revision

Viewing changes to drivers/mtd/maps/tsunami_flash.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/maps/tsunami_flash.c
76
76
        struct mtd_info *mtd;
77
77
        mtd = tsunami_flash_mtd;
78
78
        if (mtd) {
79
 
                del_mtd_device(mtd);
 
79
                mtd_device_unregister(mtd);
80
80
                map_destroy(mtd);
81
81
        }
82
82
        tsunami_flash_mtd = 0;
97
97
        }
98
98
        if (tsunami_flash_mtd) {
99
99
                tsunami_flash_mtd->owner = THIS_MODULE;
100
 
                add_mtd_device(tsunami_flash_mtd);
 
100
                mtd_device_register(tsunami_flash_mtd, NULL, 0);
101
101
                return 0;
102
102
        }
103
103
        return -ENXIO;