From: Grazvydas Ignotas <notasas@gmail.com>
Date: Sat, 22 Sep 2012 21:32:18 +0000 (+0300)
Subject: Merge branch 'stable-3.2' into pandora-3.2
X-Git-Tag: sz_release_152~15
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=81e0a6ed9888d145d25b7ccece6e1016626bc3c2

Merge branch 'stable-3.2' into pandora-3.2

Conflicts:
	drivers/mtd/ubi/vtbl.c
---

81e0a6ed9888d145d25b7ccece6e1016626bc3c2
diff --cc drivers/mtd/ubi/vtbl.c
index 437bc193e170,95b29f5ddfac..568307cc7caf
--- a/drivers/mtd/ubi/vtbl.c
+++ b/drivers/mtd/ubi/vtbl.c
@@@ -336,11 -341,12 +336,11 @@@ retry
  		goto write_error;
  
  	/*
 -	 * And add it to the scanning information. Don't delete the old version
 -	 * of this LEB as it will be deleted and freed in 'ubi_scan_add_used()'.
 +	 * And add it to the attaching information. Don't delete the old version
 +	 * of this LEB as it will be deleted and freed in 'ubi_add_to_av()'.
  	 */
 -	err = ubi_scan_add_used(ubi, si, new_seb->pnum, new_seb->ec,
 -				vid_hdr, 0);
 -	kmem_cache_free(si->scan_leb_slab, new_seb);
 +	err = ubi_add_to_av(ubi, ai, new_aeb->pnum, new_aeb->ec, vid_hdr, 0);
- 	kfree(new_aeb);
++	kmem_cache_free(ai->aeb_slab_cache, new_aeb);
  	ubi_free_vid_hdr(ubi, vid_hdr);
  	return err;
  
@@@ -350,10 -356,10 +350,10 @@@ write_error
  		 * Probably this physical eraseblock went bad, try to pick
  		 * another one.
  		 */
 -		list_add(&new_seb->u.list, &si->erase);
 +		list_add(&new_aeb->u.list, &ai->erase);
  		goto retry;
  	}
- 	kfree(new_aeb);
 -	kmem_cache_free(si->scan_leb_slab, new_seb);
++	kmem_cache_free(ai->aeb_slab_cache, new_aeb);
  out_free:
  	ubi_free_vid_hdr(ubi, vid_hdr);
  	return err;