diff options
Diffstat (limited to 'sound/isa/sb/sb_common.c')
-rw-r--r-- | sound/isa/sb/sb_common.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sound/isa/sb/sb_common.c b/sound/isa/sb/sb_common.c index f0f205ae425f..603e923b5d2f 100644 --- a/sound/isa/sb/sb_common.c +++ b/sound/isa/sb/sb_common.c | |||
@@ -45,7 +45,7 @@ int snd_sbdsp_command(sb_t *chip, unsigned char val) | |||
45 | { | 45 | { |
46 | int i; | 46 | int i; |
47 | #ifdef IO_DEBUG | 47 | #ifdef IO_DEBUG |
48 | snd_printk("command 0x%x\n", val); | 48 | snd_printk(KERN_DEBUG "command 0x%x\n", val); |
49 | #endif | 49 | #endif |
50 | for (i = BUSY_LOOPS; i; i--) | 50 | for (i = BUSY_LOOPS; i; i--) |
51 | if ((inb(SBP(chip, STATUS)) & 0x80) == 0) { | 51 | if ((inb(SBP(chip, STATUS)) & 0x80) == 0) { |
@@ -64,7 +64,7 @@ int snd_sbdsp_get_byte(sb_t *chip) | |||
64 | if (inb(SBP(chip, DATA_AVAIL)) & 0x80) { | 64 | if (inb(SBP(chip, DATA_AVAIL)) & 0x80) { |
65 | val = inb(SBP(chip, READ)); | 65 | val = inb(SBP(chip, READ)); |
66 | #ifdef IO_DEBUG | 66 | #ifdef IO_DEBUG |
67 | snd_printk("get_byte 0x%x\n", val); | 67 | snd_printk(KERN_DEBUG "get_byte 0x%x\n", val); |
68 | #endif | 68 | #endif |
69 | return val; | 69 | return val; |
70 | } | 70 | } |
@@ -154,7 +154,7 @@ static int snd_sbdsp_probe(sb_t * chip) | |||
154 | str = "16"; | 154 | str = "16"; |
155 | break; | 155 | break; |
156 | default: | 156 | default: |
157 | snd_printk("SB [0x%lx]: unknown DSP chip version %i.%i\n", | 157 | snd_printk(KERN_INFO "SB [0x%lx]: unknown DSP chip version %i.%i\n", |
158 | chip->port, major, minor); | 158 | chip->port, major, minor); |
159 | return -ENODEV; | 159 | return -ENODEV; |
160 | } | 160 | } |
@@ -178,10 +178,8 @@ static int snd_sbdsp_probe(sb_t * chip) | |||
178 | 178 | ||
179 | static int snd_sbdsp_free(sb_t *chip) | 179 | static int snd_sbdsp_free(sb_t *chip) |
180 | { | 180 | { |
181 | if (chip->res_port) { | 181 | if (chip->res_port) |
182 | release_resource(chip->res_port); | 182 | release_and_free_resource(chip->res_port); |
183 | kfree_nocheck(chip->res_port); | ||
184 | } | ||
185 | if (chip->irq >= 0) | 183 | if (chip->irq >= 0) |
186 | free_irq(chip->irq, (void *) chip); | 184 | free_irq(chip->irq, (void *) chip); |
187 | #ifdef CONFIG_ISA | 185 | #ifdef CONFIG_ISA |