mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge git://git.marvell.com/orion into devel
This commit is contained in:
commit
72aaf09fda
294 changed files with 5979 additions and 2409 deletions
|
|
@ -1022,7 +1022,7 @@ int ubi_eba_copy_leb(struct ubi_device *ubi, int from, int to,
|
|||
}
|
||||
|
||||
/*
|
||||
* OK, now the LEB is locked and we can safely start moving iy. Since
|
||||
* OK, now the LEB is locked and we can safely start moving it. Since
|
||||
* this function utilizes thie @ubi->peb1_buf buffer which is shared
|
||||
* with some other functions, so lock the buffer by taking the
|
||||
* @ubi->buf_mutex.
|
||||
|
|
|
|||
|
|
@ -320,7 +320,7 @@ static int compare_lebs(struct ubi_device *ubi, const struct ubi_scan_leb *seb,
|
|||
}
|
||||
|
||||
err = ubi_io_read_data(ubi, buf, pnum, 0, len);
|
||||
if (err && err != UBI_IO_BITFLIPS)
|
||||
if (err && err != UBI_IO_BITFLIPS && err != -EBADMSG)
|
||||
goto out_free_buf;
|
||||
|
||||
data_crc = be32_to_cpu(vid_hdr->data_crc);
|
||||
|
|
|
|||
|
|
@ -1396,7 +1396,8 @@ int ubi_thread(void *u)
|
|||
ubi_msg("%s: %d consecutive failures",
|
||||
ubi->bgt_name, WL_MAX_FAILURES);
|
||||
ubi_ro_mode(ubi);
|
||||
break;
|
||||
ubi->thread_enabled = 0;
|
||||
continue;
|
||||
}
|
||||
} else
|
||||
failures = 0;
|
||||
|
|
|
|||
Loading…
Reference in a new issue