Joe Perches wrote:
> On Wed, 2008-04-23 at 22:55 +0200, Roel Kluin wrote:
>> - xspi->irq = platform_get_irq(dev, 0);
>> - if (xspi->irq < 0) {
>> - ret = -ENXIO;
>> + ret = platform_get_irq(dev, 0);
>> + if (ret < 0)
>> goto unmap_io;
>> - }
>> +
>> + xspi->irq = ret;
>> + ret = 0;
>
> Is the only negative return from platform_get_irq ENXIO?
> I think you still need the ret = -ENXIO before the goto.
>
> Also, you don't need the ret = 0 line, it's set again
> a few lines below.
>
> I think you should end up with:
>
> ret = platform_get_irq(dev, 0);
> if (ret < 0) {
> ret = -ENXIO;
> goto unmap_io;
> }
>
> xspi->irq = ret;
>
> cheers, Joe
In that case, this should suffice,
thanks again,
Roel
---
xilinx_spi->irq is unsigned, so the test fails
Signed-off-by: Roel Kluin <[EMAIL PROTECTED]>
---
diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c
index cf6aef3..2a471b3 100644
--- a/drivers/spi/xilinx_spi.c
+++ b/drivers/spi/xilinx_spi.c
@@ -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;
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
spi-devel-general mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/spi-devel-general
