--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -336,7 +336,14 @@ static int part_lock(struct mtd_info *mt
 static int part_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
 {
 	struct mtd_part *part = PART(mtd);
-	return part->master->_unlock(part->master, ofs + part->offset, len);
+
+	ofs += part->offset;
+	if (mtd->flags & MTD_ERASE_PARTIAL) {
+		/* round up len to next erasesize and round down offset to prev block */
+		len = (mtd_div_by_eb(len, part->master) + 1) * part->master->erasesize;
+		ofs &= ~(part->master->erasesize - 1);
+	}
+	return part->master->_unlock(part->master, ofs, len);
 }
 
 static int part_is_locked(struct mtd_info *mtd, loff_t ofs, uint64_t len)
t.cgi/'><img src='/cgit.png' alt='cgit logo'/></a></td>
<td class='main'><a href='/cgit.cgi/'>index</a> : <a title='openwrt/upstream' href='/cgit.cgi/openwrt/upstream/'>openwrt/upstream</a></td><td class='form'><form method='get'>
<input type='hidden' name='id' value='74d00a8c3849c1340efd713eb94b786e304c201f'/><select name='h' onchange='this.form.submit();'>
<option value='attitude_adjustment'>attitude_adjustment</option>
<option value='barrier_breaker'>barrier_breaker</option>
<option value='chaos_calmer'>chaos_calmer</option>
<option value='lede-17.01'>lede-17.01</option>
<option value='less-old-master'>less-old-master</option>
<option value='master'>master</option>
<option value='old-master'>old-master</option>
<option value='openwrt-18.06'>openwrt-18.06</option>
<option value='openwrt-19.07'>openwrt-19.07</option>
<option value='upstream' selected='selected'>upstream</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>upstream openwrt</td><td class='sub right'>James</td></tr></table>
<table class='tabs'><tr><td>
<a href='/cgit.cgi/openwrt/upstream/about/?h=upstream'>about</a><a href='/cgit.cgi/openwrt/upstream/?h=upstream'>summary</a><a href='/cgit.cgi/openwrt/upstream/refs/?h=upstream&amp;id=74d00a8c3849c1340efd713eb94b786e304c201f'>refs</a><a href='/cgit.cgi/openwrt/upstream/log/target/linux/generic/pending-4.9/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch?h=upstream'>log</a><a class='active' href='/cgit.cgi/openwrt/upstream/tree/target/linux/generic/pending-4.9/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch?h=upstream&amp;id=74d00a8c3849c1340efd713eb94b786e304c201f'>tree</a><a href='/cgit.cgi/openwrt/upstream/commit/target/linux/generic/pending-4.9/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch?h=upstream&amp;id=74d00a8c3849c1340efd713eb94b786e304c201f'>commit</a><a href='/cgit.cgi/openwrt/upstream/diff/target/linux/generic/pending-4.9/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch?h=upstream&amp;id=74d00a8c3849c1340efd713eb94b786e304c201f'>diff</a><a href='/cgit.cgi/openwrt/upstream/stats/target/linux/generic/pending-4.9/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch?h=upstream'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit.cgi/openwrt/upstream/log/target/linux/generic/pending-4.9/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch'>
<input type='hidden' name='h' value='upstream'/><input type='hidden' name='id' value='74d00a8c3849c1340efd713eb94b786e304c201f'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/cgit.cgi/openwrt/upstream/tree/?h=upstream&amp;id=74d00a8c3849c1340efd713eb94b786e304c201f'>root</a>/<a href='/cgit.cgi/openwrt/upstream/tree/target?h=upstream&amp;id=74d00a8c3849c1340efd713eb94b786e304c201f'>target</a>/<a href='/cgit.cgi/openwrt/upstream/tree/target/linux?h=upstream&amp;id=74d00a8c3849c1340efd713eb94b786e304c201f'>linux</a>/<a href='/cgit.cgi/openwrt/upstream/tree/target/linux/generic?h=upstream&amp;id=74d00a8c3849c1340efd713eb94b786e304c201f'>generic</a>/<a href='/cgit.cgi/openwrt/upstream/tree/target/linux/generic/pending-4.9?h=upstream&amp;id=74d00a8c3849c1340efd713eb94b786e304c201f'>pending-4.9</a>/<a href='/cgit.cgi/openwrt/upstream/tree/target/linux/generic/pending-4.9/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch?h=upstream&amp;id=74d00a8c3849c1340efd713eb94b786e304c201f'>493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch</a></div><div class='content'>blob: e41dca6c93ba9d0c5080f3b27c431d8b34f39402 (<a href='/cgit.cgi/openwrt/upstream/plain/target/linux/generic/pending-4.9/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch?h=upstream&amp;id=74d00a8c3849c1340efd713eb94b786e304c201f'>plain</a>)
<table summary='blob content' class='blob'>
<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
<a id='n2' href='#n2'>2</a>
<a id='n3' href='#n3'>3</a>
<a id='n4' href='#n4'>4</a>
<a id='n5' href='#n5'>5</a>
<a id='n6' href='#n6'>6</a>
<a id='n7' href='#n7'>7</a>
<a id='n8' href='#n8'>8</a>
<a id='n9' href='#n9'>9</a>
<a id='n10' href='#n10'>10</a>
<a id='n11' href='#n11'>11</a>
<a id='n12' href='#n12'>12</a>
<a id='n13' href='#n13'>13</a>
<a id='n14' href='#n14'>14</a>
<a id='n15' href='#n15'>15</a>
<a id='n16' href='#n16'>16</a>
<a id='n17' href='#n17'>17</a>
<a id='n18' href='#n18'>18</a>
<a id='n19' href='#n19'>19</a>
<a id='n20' href='#n20'>20</a>
<a id='n21' href='#n21'>21</a>
<a id='n22' href='#n22'>22</a>
<a id='n23' href='#n23'>23</a>
<a id='n24' href='#n24'>24</a>
<a id='n25' href='#n25'>25</a>
<a id='n26' href='#n26'>26</a>
<a id='n27' href='#n27'>27</a>
<a id='n28' href='#n28'>28</a>
<a id='n29' href='#n29'>29</a>
<a id='n30' href='#n30'>30</a>
<a id='n31' href='#n31'>31</a>
<a id='n32' href='#n32'>32</a>
<a id='n33' href='#n33'>33</a>
<a id='n34' href='#n34'>34</a>
</pre></td>
<td class='lines'><pre><code>