public inbox for kernel-janitors@vger.kernel.org
 help / color / mirror / Atom feed
* [patch] ALSA: hda - cut and paste typo in cs420x_models[]
@ 2011-11-24 11:48 Dan Carpenter
  2011-11-24 12:08 ` Takashi Iwai
  0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2011-11-24 11:48 UTC (permalink / raw)
  To: Jaroslav Kysela
  Cc: alsa-devel, Stephen Warren, Takashi Iwai, kernel-janitors,
	Paul Gortmaker, David Henningsson, Tim Howe

The CS420X_IMAC27 was copied from the line before but CS420X_APPLE
was clearly intented.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
index 7bd2a52..70a7abd 100644
--- a/sound/pci/hda/patch_cirrus.c
+++ b/sound/pci/hda/patch_cirrus.c
@@ -1278,7 +1278,7 @@ static const char * const cs420x_models[CS420X_MODELS] = {
 	[CS420X_MBP53] = "mbp53",
 	[CS420X_MBP55] = "mbp55",
 	[CS420X_IMAC27] = "imac27",
-	[CS420X_IMAC27] = "apple",
+	[CS420X_APPLE] = "apple",
 	[CS420X_AUTO] = "auto",
 };
 

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [patch] ALSA: hda - cut and paste typo in cs420x_models[]
  2011-11-24 11:48 [patch] ALSA: hda - cut and paste typo in cs420x_models[] Dan Carpenter
@ 2011-11-24 12:08 ` Takashi Iwai
  0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2011-11-24 12:08 UTC (permalink / raw)
  To: Dan Carpenter
  Cc: alsa-devel, Stephen Warren, kernel-janitors, Paul Gortmaker,
	David Henningsson, Tim Howe

At Thu, 24 Nov 2011 14:48:24 +0300,
Dan Carpenter wrote:
> 
> The CS420X_IMAC27 was copied from the line before but CS420X_APPLE
> was clearly intented.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Applied now.  Thanks!


Takashi

> 
> diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
> index 7bd2a52..70a7abd 100644
> --- a/sound/pci/hda/patch_cirrus.c
> +++ b/sound/pci/hda/patch_cirrus.c
> @@ -1278,7 +1278,7 @@ static const char * const cs420x_models[CS420X_MODELS] = {
>  	[CS420X_MBP53] = "mbp53",
>  	[CS420X_MBP55] = "mbp55",
>  	[CS420X_IMAC27] = "imac27",
> -	[CS420X_IMAC27] = "apple",
> +	[CS420X_APPLE] = "apple",
>  	[CS420X_AUTO] = "auto",
>  };
>  
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-11-24 12:08 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-24 11:48 [patch] ALSA: hda - cut and paste typo in cs420x_models[] Dan Carpenter
2011-11-24 12:08 ` Takashi Iwai

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox