OSDN Git Service

mtd: m25p80: assign default read command
authorBrian Norris <computersforpeace@gmail.com>
Thu, 5 Dec 2013 06:59:40 +0000 (22:59 -0800)
committerBrian Norris <computersforpeace@gmail.com>
Mon, 20 Jan 2014 19:49:48 +0000 (11:49 -0800)
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>
drivers/mtd/devices/m25p80.c

index 19632e3..d0f6475 100644 (file)
@@ -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;