diff options
| author | Gernot Vormayr <gvormayr@gmail.com> | 2013-05-25 00:55:03 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-25 01:22:50 +0200 |
| commit | 585dc0c2f68981c02a0bb6fc8fe191a3f513959c (patch) | |
| tree | 666f0d81139ab251365a7a0a171c50e333407d04 /drivers/block/xsysace.c | |
| parent | Merge tag 'trace-fixes-v3.10-rc2' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| download | linux-585dc0c2f68981c02a0bb6fc8fe191a3f513959c.tar.xz linux-585dc0c2f68981c02a0bb6fc8fe191a3f513959c.zip | |
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@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '')
| -rw-r--r-- | 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 f8ef15f37c5e..3fd130fdfbc1 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; |