From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 12 Jan 2010 12:59:05 +0000 (+0000)
Subject: Merge branch 'for-2.6.33' into for-2.6.34
X-Git-Tag: v2.6.35-rc6~9^2~7^2~219
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=163849ea9b4c5d50fbd324692461983d18faadad;p=~emulex%2Finfiniband.git

Merge branch 'for-2.6.33' into for-2.6.34
---

163849ea9b4c5d50fbd324692461983d18faadad
diff --cc sound/soc/sh/fsi.c
index 123cd6f45e0,42813b80838..5f9f2693f4e
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@@ -896,14 -874,9 +896,14 @@@ static int fsi_probe(struct platform_de
  	unsigned int irq;
  	int ret;
  
 +	if (0 != pdev->id) {
 +		dev_err(&pdev->dev, "current fsi support id 0 only now\n");
 +		return -ENODEV;
 +	}
 +
  	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
  	irq = platform_get_irq(pdev, 0);
- 	if (!res || !irq) {
+ 	if (!res || (int)irq <= 0) {
  		dev_err(&pdev->dev, "Not enough FSI platform resources.\n");
  		ret = -ENODEV;
  		goto exit;