Commit d7fe321e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.infradead.org/~dedekind/ubi-2.6 

* 'for-linus' of git://git.infradead.org/~dedekind/ubi-2.6:
  UBI: mtd/ubi/vtbl.c: fix memory leak
  UBI: fix sparse errors in ubi.h
  UBI: fix error message
  UBI: silence warning
parents 4a0d3f3a f7f02837

drivers/mtd/ubi/build.c

+2 −2
Original line number Diff line number Diff line
@@ -1000,8 +1000,8 @@ static int __init ubi_init(void) 
		mutex_unlock(&ubi_devices_mutex);

		if (err < 0) {

			put_mtd_device(mtd);

			printk(KERN_ERR "UBI error: cannot attach %s\n",

			       p->name);

			printk(KERN_ERR "UBI error: cannot attach mtd%d\n",

			       mtd->index);

			goto out_detach;

		}

	}

drivers/mtd/ubi/ubi.h

+5 −5
Original line number Diff line number Diff line
@@ -217,11 +217,11 @@ struct ubi_volume { 
	void *upd_buf;



	int *eba_tbl;

	int checked:1;

	int corrupted:1;

	int upd_marker:1;

	int updating:1;

	int changing_leb:1;

	unsigned int checked:1;

	unsigned int corrupted:1;

	unsigned int upd_marker:1;

	unsigned int updating:1;

	unsigned int changing_leb:1;



#ifdef CONFIG_MTD_UBI_GLUEBI

	/*

drivers/mtd/ubi/vmt.c

+3 −1
Original line number Diff line number Diff line
@@ -376,7 +376,9 @@ int ubi_create_volume(struct ubi_device *ubi, struct ubi_mkvol_req *req) 
	get_device(&vol->dev);

	volume_sysfs_close(vol);

out_gluebi:

	ubi_destroy_gluebi(vol);

	if (ubi_destroy_gluebi(vol))

		dbg_err("cannot destroy gluebi for volume %d:%d",

			ubi->ubi_num, vol_id);

out_cdev:

	cdev_del(&vol->cdev);

out_mapping:

drivers/mtd/ubi/vtbl.c

+1 −0
Original line number Diff line number Diff line
@@ -519,6 +519,7 @@ static int init_volumes(struct ubi_device *ubi, const struct ubi_scan_info *si, 
			if (ubi->autoresize_vol_id != -1) {

				ubi_err("more then one auto-resize volume (%d "

					"and %d)", ubi->autoresize_vol_id, i);

				kfree(vol);

				return -EINVAL;

			}