Commit 99ed1a16 authored by Brian Norris's avatar Brian Norris
Browse files

mtd: m25p80: assign default read command



In the following commit (in -next):

    commit 8552b439
    drivers: mtd: m25p80: convert "bool" read check into an enum

We converted the boolean 'fast_read' property to become an enum
'flash_read', but at the same time, we changed the conditional path so
that it doesn't choose a default value in some cases (technically, we
choose the correct default simply by virtue of devm_kzalloc(), which
zeroes this out to be a NORMAL read operation, but still...).

Fix this by setting a default for the 'else' clause.

Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
Cc: Sourav Poddar <sourav.poddar@ti.com>
Acked-by: default avatarMarek Vasut <marex@denx.de>
parent 973b88fb
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -1204,6 +1204,8 @@ static int m25p_probe(struct spi_device *spi)
		/* If we were instantiated by DT, use it */
		if (of_property_read_bool(np, "m25p,fast-read"))
			flash->flash_read = M25P80_FAST;
		else
			flash->flash_read = M25P80_NORMAL;
	} else {
		/* If we weren't instantiated by DT, default to fast-read */
		flash->flash_read = M25P80_FAST;