diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-30 22:34:17 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-30 22:34:17 +0300 |
| commit | e2a2444a90ba12f123c9c59362ffe3ab278bccb9 (patch) | |
| tree | 53656429fc7216ba96e71e76b11f8e4539816058 /drivers/mtd/ubi/scan.c | |
| parent | 8decec78a3d9e240f14553284629ac4851ff3744 (diff) | |
| parent | 2ad49887150894b9ed6a87a76b409adceee6b074 (diff) | |
| download | linux-e2a2444a90ba12f123c9c59362ffe3ab278bccb9.tar.xz | |
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
* 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6:
UBI: Don't exit from ubi_thread until kthread_should_stop() is true
UBI: fix EBADMSG handling
Diffstat (limited to 'drivers/mtd/ubi/scan.c')
| -rw-r--r-- | drivers/mtd/ubi/scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/ubi/scan.c b/drivers/mtd/ubi/scan.c index 4f2daa5bbecf..41d47e1cf15c 100644 --- a/drivers/mtd/ubi/scan.c +++ b/drivers/mtd/ubi/scan.c @@ -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); |