Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mtd: m25p80: assign default read command

In the following commit (in -next):

commit 8552b439aba7f32063755d23f79ca27b4d0a3115
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: Brian Norris <computersforpeace@gmail.com>
Cc: Sourav Poddar <sourav.poddar@ti.com>
Acked-by: Marek Vasut <marex@denx.de>

+2
+2
drivers/mtd/devices/m25p80.c
··· 1204 1204 /* If we were instantiated by DT, use it */ 1205 1205 if (of_property_read_bool(np, "m25p,fast-read")) 1206 1206 flash->flash_read = M25P80_FAST; 1207 + else 1208 + flash->flash_read = M25P80_NORMAL; 1207 1209 } else { 1208 1210 /* If we weren't instantiated by DT, default to fast-read */ 1209 1211 flash->flash_read = M25P80_FAST;