From 6f066f536b0a85a1eb886ba98fee6b875169d37f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Wed, 20 Jan 2010 13:49:44 -0700 Subject: [PATCH] --- yaml --- r: 180879 b: refs/heads/master c: e9a172f074ba85de144e63b0786c7c5c5ba93c3a h: refs/heads/master i: 180877: dd9163c2a2c0770f60cbf6af4ff8a472093b108d 180875: 029cdbddd857ac80dddf4ce9df4550e48f66648f 180871: 2e88073174f1d3f7ecaad1e28c46e4b7971c738d 180863: c604f4472054ced0cc16ebb767314453066a7aed v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi_mpc8xxx.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b774cdfcba01..5a150295306d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 34b8c66173666025020e3a6f8d4a5c238b19cde5 +refs/heads/master: e9a172f074ba85de144e63b0786c7c5c5ba93c3a diff --git a/trunk/drivers/spi/spi_mpc8xxx.c b/trunk/drivers/spi/spi_mpc8xxx.c index 1fb2a6ea328c..08065fb15817 100644 --- a/trunk/drivers/spi/spi_mpc8xxx.c +++ b/trunk/drivers/spi/spi_mpc8xxx.c @@ -1328,7 +1328,7 @@ static struct of_platform_driver of_mpc8xxx_spi_driver = { static int __devinit plat_mpc8xxx_spi_probe(struct platform_device *pdev) { struct resource *mem; - unsigned int irq; + int irq; struct spi_master *master; if (!pdev->dev.platform_data) @@ -1339,7 +1339,7 @@ static int __devinit plat_mpc8xxx_spi_probe(struct platform_device *pdev) return -EINVAL; irq = platform_get_irq(pdev, 0); - if (!irq) + if (irq <= 0) return -EINVAL; master = mpc8xxx_spi_probe(&pdev->dev, mem, irq);