[alsa-devel] ASoC updates for 2.6.30

[Takashi Iwai]

At Thu, 19 Mar 2009 12:00:28 +0000,
Mark Brown wrote:
> 
> The following changes since commit da88b48b84e1a504b6a19aff9d5b8236a59e228a:
>   Mark Brown (1):
>         Merge branch 'pxa-ssp' into for-2.6.30
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.30

Pulled now.  Thanks.

Meanwhile, I fixed one compile warning due to the recent commit below.

Takashi

===
From 1f2186951e02f2a5bcda9459f63136918932385a Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai at suse.de>
Date: Thu, 19 Mar 2009 14:08:58 +0100
Subject: [PATCH] ALSA: Fix wrong pointer to dev_err() in arm/pxa2xx-ac97-lib.c

Fix the wrong device pointer passed to dev_err().

Signed-off-by: Takashi Iwai <tiwai at suse.de>
---
 sound/arm/pxa2xx-ac97-lib.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c
index d721ea7..2e6355f 100644
--- a/sound/arm/pxa2xx-ac97-lib.c
+++ b/sound/arm/pxa2xx-ac97-lib.c
@@ -374,7 +374,7 @@ int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev)
 		case -1:
 			break;
 		default:
-			dev_err(dev, "Invalid reset GPIO %d\n",
+			dev_err(&dev->dev, "Invalid reset GPIO %d\n",
 				pdata->reset_gpio);
 		}
 	} else {
-- 
1.6.2