[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1360247452-15451-1-git-send-email-michal.simek@xilinx.com>
Date: Thu, 7 Feb 2013 15:30:52 +0100
From: Michal Simek <michal.simek@...inx.com>
To: linux-kernel@...r.kernel.org, monstr@...str.eu
Cc: Alexey.Brodkin@...opsys.com, grant.likely@...retlab.ca,
Graeme Smecher <gsmecher@...eespeedlogic.com>
Subject: [PATCH] block: xsysace: Fix device name assignment for SystemACE (from "xs`" to "xsa").
From: Graeme Smecher <gsmecher@...eespeedlogic.com>
This fixes a bug introduced in 5d10302f46d, where device trees that don't
provide the "port-number" attribute are mistakenly assigned the device "xs`".
The error check that's supposed to assign a default letter can't succeed,
since it tests an unsigned type against a negative return code.
Signed-off-by: Graeme Smecher <gsmecher@...eespeedlogic.com>
Acked-by: Grant Likely <grant.likely@...retlab.ca>
Signed-off-by: Michal Simek <michal.simek@...inx.com>
---
drivers/block/xsysace.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index 64fd3c0..9462e68 100644
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -1161,8 +1161,7 @@ static int ace_probe(struct platform_device *dev)
dev_dbg(&dev->dev, "ace_probe(%p)\n", dev);
/* device id and bus width */
- of_property_read_u32(dev->dev.of_node, "port-number", &id);
- if (id < 0)
+ if (of_property_read_u32(dev->dev.of_node, "port-number", &id))
id = 0;
if (of_find_property(dev->dev.of_node, "8-bit", NULL))
bus_width = ACE_BUS_WIDTH_8;
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists