diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /sound/drivers/ml403-ac97cr.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'sound/drivers/ml403-ac97cr.c')
| -rw-r--r-- | sound/drivers/ml403-ac97cr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/drivers/ml403-ac97cr.c b/sound/drivers/ml403-ac97cr.c index a1282c1c0591..5cfcb908c430 100644 --- a/sound/drivers/ml403-ac97cr.c +++ b/sound/drivers/ml403-ac97cr.c | |||
| @@ -1143,8 +1143,8 @@ snd_ml403_ac97cr_create(struct snd_card *card, struct platform_device *pfdev, | |||
| 1143 | (resource->start) + 1); | 1143 | (resource->start) + 1); |
| 1144 | if (ml403_ac97cr->port == NULL) { | 1144 | if (ml403_ac97cr->port == NULL) { |
| 1145 | snd_printk(KERN_ERR SND_ML403_AC97CR_DRIVER ": " | 1145 | snd_printk(KERN_ERR SND_ML403_AC97CR_DRIVER ": " |
| 1146 | "unable to remap memory region (%x to %x)\n", | 1146 | "unable to remap memory region (%pR)\n", |
| 1147 | resource->start, resource->end); | 1147 | resource); |
| 1148 | snd_ml403_ac97cr_free(ml403_ac97cr); | 1148 | snd_ml403_ac97cr_free(ml403_ac97cr); |
| 1149 | return -EBUSY; | 1149 | return -EBUSY; |
| 1150 | } | 1150 | } |