Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 105438
b: refs/heads/master
c: 166a375
h: refs/heads/master
v: v3
  • Loading branch information
Roel Kluin authored and Linus Torvalds committed Jul 24, 2008
1 parent 2484fed commit 09f12b3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a61f5345eba34772a71523227de890a28410f320
refs/heads/master: 166a375b657b7af494f4ce3f72c4d2002180da44
5 changes: 3 additions & 2 deletions trunk/drivers/spi/xilinx_spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -353,11 +353,12 @@ static int __init xilinx_spi_probe(struct platform_device *dev)
goto put_master;
}

xspi->irq = platform_get_irq(dev, 0);
if (xspi->irq < 0) {
ret = platform_get_irq(dev, 0);
if (ret < 0) {
ret = -ENXIO;
goto unmap_io;
}
xspi->irq = ret;

master->bus_num = pdata->bus_num;
master->num_chipselect = pdata->num_chipselect;
Expand Down

0 comments on commit 09f12b3

Please sign in to comment.