mtd: nand-gpio: don't waste memory for OF failure
Subsystems (2)
PATCH 1/1 mtd: nand-gpio: don't waste memory for OF failure
We shouldn't try to allocate a resource until we're sure the of_property_read_u64() call didn't fail. This is especially important if we use this code for both CONFIG_OF and !CONFIG_OF builds, since of_property_read_u64() will always return -ENOSYS for !CONFIG_OF.
Signed-off-by Brian Norris <[email protected]>
---
Compile tested only
drivers/mtd/nand/gpio.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/mtd/nand/gpio.c +6 -2
@@ -132,13 +132,17 @@ static int gpio_nand_get_config_of(const struct device *dev,static struct resource *gpio_nand_get_io_sync_of (struct platform_device *pdev) { -struct resource *r =devm_kzalloc (&pdev->dev,sizeof (*r),GFP_KERNEL ); +struct resource *r;u64 addr; -if (!r ||of_property_read_u64 (pdev->dev.of_node, +if (of_property_read_u64 (pdev->dev.of_node,"gpio-control-nand,io-sync-reg" , &addr))return NULL ; + r =devm_kzalloc (&pdev->dev,sizeof (*r),GFP_KERNEL ); +if (!r) +return NULL ; + r->start = addr; r->end = r->start +0x3 ; r->flags =IORESOURCE_MEM ;
Signature · 1 line
1.8.3.2
Brian Norris
AppliedQuoted 8 lines · Brian Norris
We shouldn't try to allocate a resource until we're sure the
of_property_read_u64()call didn't fail. This is especially important if we use this code for bothCONFIG_OFand !CONFIG_OF builds, sinceof_property_read_u64()will always return-ENOSYSfor !CONFIG_OF.Signed-off-by Brian Norris <[email protected]>---
Compile tested only
Pushed to l2-mtd.git.
Brian