diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:50 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:50 -0400 |
| commit | e0d2054fd3cf167395390dc1758644486c782707 (patch) | |
| tree | 108fd3138f0246f5fa17454680d6d04a670ed6d8 /sound/pci/ali5451 | |
| parent | d807500a2472445d05ce641bf09438e3d72eeb4f (diff) | |
| parent | c468ac29e63b9927275a94379d00b367f0f97c43 (diff) | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/ali5451')
| -rw-r--r-- | sound/pci/ali5451/ali5451.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c index b36c551da566..4edf270a7809 100644 --- a/sound/pci/ali5451/ali5451.c +++ b/sound/pci/ali5451/ali5451.c | |||
| @@ -2142,7 +2142,7 @@ static int __devinit snd_ali_resources(struct snd_ali *codec) | |||
| 2142 | { | 2142 | { |
| 2143 | int err; | 2143 | int err; |
| 2144 | 2144 | ||
| 2145 | snd_ali_printk("resouces allocation ...\n"); | 2145 | snd_ali_printk("resources allocation ...\n"); |
| 2146 | err = pci_request_regions(codec->pci, "ALI 5451"); | 2146 | err = pci_request_regions(codec->pci, "ALI 5451"); |
| 2147 | if (err < 0) | 2147 | if (err < 0) |
| 2148 | return err; | 2148 | return err; |
| @@ -2154,7 +2154,7 @@ static int __devinit snd_ali_resources(struct snd_ali *codec) | |||
| 2154 | return -EBUSY; | 2154 | return -EBUSY; |
| 2155 | } | 2155 | } |
| 2156 | codec->irq = codec->pci->irq; | 2156 | codec->irq = codec->pci->irq; |
| 2157 | snd_ali_printk("resouces allocated.\n"); | 2157 | snd_ali_printk("resources allocated.\n"); |
| 2158 | return 0; | 2158 | return 0; |
| 2159 | } | 2159 | } |
| 2160 | static int snd_ali_dev_free(struct snd_device *device) | 2160 | static int snd_ali_dev_free(struct snd_device *device) |