diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-06-18 12:56:59 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-06-18 12:56:59 +0800 |
| commit | 428ee0d0d38f2cf5b1c4d584f7b2eee76d7a992e (patch) | |
| tree | 300c2be1c37669c7f7605285dbfe767eb56d31c0 /block | |
| parent | e91e57d305c5b655c672e63eaed6b762d7fa21b5 (diff) | |
| parent | 1bd30958ec55d80ca72d2ca4e7e5c3d9fbf3173e (diff) | |
Merge tag 'v4.4.73' into linux-linaro-lsk-v4.4
This is the 4.4.73 stable release
Diffstat (limited to 'block')
| -rw-r--r-- | block/partitions/msdos.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block/partitions/msdos.c b/block/partitions/msdos.c index 93e7c1b32edd..5610cd537da7 100644 --- a/block/partitions/msdos.c +++ b/block/partitions/msdos.c @@ -300,6 +300,8 @@ static void parse_bsd(struct parsed_partitions *state, continue; bsd_start = le32_to_cpu(p->p_offset); bsd_size = le32_to_cpu(p->p_size); + if (memcmp(flavour, "bsd\0", 4) == 0) + bsd_start += offset; if (offset == bsd_start && size == bsd_size) /* full parent partition, we have it already */ continue; |