From c7c3c338cb25d7f55ddb3f6bfbf3572758ca3896 Mon Sep 17 00:00:00 2001
From: Jonas Gorski <jonas.gorski@gmail.com>
Date: Thu, 10 Nov 2011 16:53:08 +0100
Subject: [PATCH 50/79] MTD: DEVICES: m25p80: use parsers if provided in flash
 platform data

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
---
 drivers/mtd/devices/m25p80.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -1314,7 +1314,8 @@ static int m25p_probe(struct spi_device
 	/* partitions should match sector boundaries; and it may be good to
 	 * use readonly partitions for writeprotected sectors (BP2..BP0).
 	 */
-	return mtd_device_parse_register(&flash->mtd, NULL, &ppdata,
+	return mtd_device_parse_register(&flash->mtd,
+			data ? data->part_probe_types : NULL, &ppdata,
 			data ? data->parts : NULL,
 			data ? data->nr_parts : 0);
 }
nge='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'>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=v18.06.5'>about</a><a href='/cgit.cgi/openwrt/upstream/?h=v18.06.5'>summary</a><a href='/cgit.cgi/openwrt/upstream/refs/?h=v18.06.5&amp;id=57214b00aed49a43bf8070772d87663971b2af14'>refs</a><a href='/cgit.cgi/openwrt/upstream/log/target/linux/brcm63xx/dts/bcm96368MVWG.dts?h=v18.06.5'>log</a><a class='active' href='/cgit.cgi/openwrt/upstream/tree/target/linux/brcm63xx/dts/bcm96368MVWG.dts?h=v18.06.5&amp;id=57214b00aed49a43bf8070772d87663971b2af14'>tree</a><a href='/cgit.cgi/openwrt/upstream/commit/target/linux/brcm63xx/dts/bcm96368MVWG.dts?h=v18.06.5&amp;id=57214b00aed49a43bf8070772d87663971b2af14'>commit</a><a href='/cgit.cgi/openwrt/upstream/diff/target/linux/brcm63xx/dts/bcm96368MVWG.dts?h=v18.06.5&amp;id=57214b00aed49a43bf8070772d87663971b2af14'>diff</a><a href='/cgit.cgi/openwrt/upstream/stats/target/linux/brcm63xx/dts/bcm96368MVWG.dts?h=v18.06.5'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit.cgi/openwrt/upstream/log/target/linux/brcm63xx/dts/bcm96368MVWG.dts'>
<input type='hidden' name='h' value='v18.06.5'/><input type='hidden' name='id' value='57214b00aed49a43bf8070772d87663971b2af14'/><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=v18.06.5&amp;id=57214b00aed49a43bf8070772d87663971b2af14'>root</a>/<a href='/cgit.cgi/openwrt/upstream/tree/target?h=v18.06.5&amp;id=57214b00aed49a43bf8070772d87663971b2af14'>target</a>/<a href='/cgit.cgi/openwrt/upstream/tree/target/linux?h=v18.06.5&amp;id=57214b00aed49a43bf8070772d87663971b2af14'>linux</a>/<a href='/cgit.cgi/openwrt/upstream/tree/target/linux/brcm63xx?h=v18.06.5&amp;id=57214b00aed49a43bf8070772d87663971b2af14'>brcm63xx</a>/<a href='/cgit.cgi/openwrt/upstream/tree/target/linux/brcm63xx/dts?h=v18.06.5&amp;id=57214b00aed49a43bf8070772d87663971b2af14'>dts</a>/<a href='/cgit.cgi/openwrt/upstream/tree/target/linux/brcm63xx/dts/bcm96368MVWG.dts?h=v18.06.5&amp;id=57214b00aed49a43bf8070772d87663971b2af14'>bcm96368MVWG.dts</a></div><div class='content'>blob: f462411c948ffada38932f8b2d07bbc52f7bc917 (<a href='/cgit.cgi/openwrt/upstream/plain/target/linux/brcm63xx/dts/bcm96368MVWG.dts?h=v18.06.5&amp;id=57214b00aed49a43bf8070772d87663971b2af14'>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>
</pre></td>
<td class='lines'><pre><code>