diff --git a/[refs] b/[refs] index 0079cf1872af..6ecd968c7a5d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d536058752274b2fe60135142da550b5355ffa94 +refs/heads/master: 2f9270e7fe86591d6ba01c0df6ad3f6c035687ea diff --git a/trunk/drivers/mtd/ubi/scan.c b/trunk/drivers/mtd/ubi/scan.c index c7b0afc9d280..0c05f7b90127 100644 --- a/trunk/drivers/mtd/ubi/scan.c +++ b/trunk/drivers/mtd/ubi/scan.c @@ -390,7 +390,6 @@ static int compare_lebs(struct ubi_device *ubi, const struct ubi_scan_leb *seb, vfree(buf); out_free_vidh: ubi_free_vid_hdr(ubi, vh); - ubi_assert(err < 0); return err; }