diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-10-14 14:29:00 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-10-14 14:29:00 +0100 |
| commit | e3d18658d4f28e4783e1bb1c41e9134c9e5db0a9 (patch) | |
| tree | d4fe529460e98522775bc0ecca557dcc76866999 /drivers/mtd/ubi/vtbl.c | |
| parent | a2e1b833d9e0231d67e722b7e2f4d79daf919baf (diff) | |
| parent | cc5f4f28755b3b152297fd7bc3e03781dd8008e2 (diff) | |
Merge branch 'master' of git://git.infradead.org/~dedekind/ubi-2.6
Diffstat (limited to 'drivers/mtd/ubi/vtbl.c')
| -rw-r--r-- | drivers/mtd/ubi/vtbl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c index bc5df50813d6..25b3bd61c7ec 100644 --- a/drivers/mtd/ubi/vtbl.c +++ b/drivers/mtd/ubi/vtbl.c @@ -254,7 +254,7 @@ bad: * This function returns zero in case of success and a negative error code in * case of failure. */ -static int create_vtbl(const struct ubi_device *ubi, struct ubi_scan_info *si, +static int create_vtbl(struct ubi_device *ubi, struct ubi_scan_info *si, int copy, void *vtbl) { int err, tries = 0; @@ -264,7 +264,7 @@ static int create_vtbl(const struct ubi_device *ubi, struct ubi_scan_info *si, ubi_msg("create volume table (copy #%d)", copy + 1); - vid_hdr = ubi_zalloc_vid_hdr(ubi); + vid_hdr = ubi_zalloc_vid_hdr(ubi, GFP_KERNEL); if (!vid_hdr) return -ENOMEM; @@ -339,7 +339,7 @@ out_free: * not corrupted, and recovering from corruptions if needed. Returns volume * table in case of success and a negative error code in case of failure. */ -static struct ubi_vtbl_record *process_lvol(const struct ubi_device *ubi, +static struct ubi_vtbl_record *process_lvol(struct ubi_device *ubi, struct ubi_scan_info *si, struct ubi_scan_volume *sv) { @@ -453,7 +453,7 @@ out_free: * This function returns volume table contents in case of success and a * negative error code in case of failure. */ -static struct ubi_vtbl_record *create_empty_lvol(const struct ubi_device *ubi, +static struct ubi_vtbl_record *create_empty_lvol(struct ubi_device *ubi, struct ubi_scan_info *si) { int i; |