Subject: [merged] drivers-block-xsysacec-fix-id-with-missing-port-number.patch removed from -mm tree
To: gvormayr@xxxxxxxxx,axboe@xxxxxxxxx,grant.likely@xxxxxxxxxx,gregkh@xxxxxxxxxxxxxxxxxxx,rob.herring@xxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Tue, 28 May 2013 12:36:32 -0700
The patch titled
Subject: drivers/block/xsysace.c: fix id with missing port-number
has been removed from the -mm tree. Its filename was
drivers-block-xsysacec-fix-id-with-missing-port-number.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Gernot Vormayr <gvormayr@xxxxxxxxx>
Subject: drivers/block/xsysace.c: fix id with missing port-number
If the port number is missing from the device-tree the device gets named
xs` instead of xsa. This fixes the check for missing ids.
Tested on ml507 board.
Signed-off-by: Gernot Vormayr <gvormayr@xxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Cc: Jens Axboe <axboe@xxxxxxxxx>
Cc: Grant Likely <grant.likely@xxxxxxxxxx>
Cc: Rob Herring <rob.herring@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/block/xsysace.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff -puN drivers/block/xsysace.c~drivers-block-xsysacec-fix-id-with-missing-port-number drivers/block/xsysace.c
--- a/drivers/block/xsysace.c~drivers-block-xsysacec-fix-id-with-missing-port-number
+++ a/drivers/block/xsysace.c
@@ -1160,8 +1160,7 @@ static int ace_probe(struct platform_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;
_
Patches currently in -mm which might be from gvormayr@xxxxxxxxx are
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
