[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <51AC9068.7050203@monstr.eu>
Date: Mon, 03 Jun 2013 14:47:36 +0200
From: Michal Simek <monstr@...str.eu>
To: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
CC: linux-kernel@...r.kernel.org,
Graeme Smecher <gsmecher@...eespeedlogic.com>,
Grant Likely <grant.likely@...retlab.ca>,
Al Viro <viro@...iv.linux.org.uk>
Subject: Re: [PATCH 1/2] xilinx systemace: Fix device name assignment for
SystemACE (from "xs`" to "xsa").
Hi Greg,
do you want to take these two patches through your tree?
Or should I take them through my microblaze tree?
Thanks,
Michal
On 05/23/2013 02:31 PM, Michal Simek wrote:
> 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>
> Signed-off-by: Michal Simek <michal.simek@...inx.com>
> Acked-by: Grant Likely <grant.likely@...retlab.ca>
> ---
> drivers/block/xsysace.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
> index f8ef15f..3fd130f 100644
> --- a/drivers/block/xsysace.c
> +++ b/drivers/block/xsysace.c
> @@ -1160,8 +1160,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.8.2.3
>
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
Download attachment "signature.asc" of type "application/pgp-signature" (264 bytes)
Powered by blists - more mailing lists