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 <[email protected]> > > 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 <[email protected]> > Signed-off-by: Michal Simek <[email protected]> > Acked-by: Grant Likely <[email protected]> > --- > 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
signature.asc
Description: OpenPGP digital signature
