Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1cf0bc7e730c4148605164ac542c1c191c1d2e09
Commit:     1cf0bc7e730c4148605164ac542c1c191c1d2e09
Parent:     7b758d2f74be4f255d8c80b5c302d4c3b8fc3863
Author:     Krzysztof Helt <[EMAIL PROTECTED]>
AuthorDate: Mon Sep 17 14:43:14 2007 +0200
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Tue Oct 16 16:50:45 2007 +0200

    [ALSA] sc6000: 2 minor fixes
    
    This patch zeroes buffer for the card name and
    fixes incorrect jump in the probe function.
    
    Signed-off-by: Krzysztof Helt <[EMAIL PROTECTED]>
    Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
    Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/isa/sc6000.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/sound/isa/sc6000.c b/sound/isa/sc6000.c
index 3032fa9..94daf83 100644
--- a/sound/isa/sc6000.c
+++ b/sound/isa/sc6000.c
@@ -352,6 +352,7 @@ static int __devinit sc6000_init_board(char __iomem *vport, 
int irq, int dma,
                return err;
        }
 
+       memset(answer, 0, sizeof(answer));
        err = sc6000_dsp_get_answer(vport, GET_DSP_COPYRIGHT, answer, 15);
        if (err <= 0) {
                snd_printk(KERN_ERR "sc6000_dsp_copyright: failed!\n");
@@ -530,7 +531,7 @@ static int __devinit snd_sc6000_probe(struct device 
*devptr, unsigned int dev)
                snd_printk(KERN_ERR PFX
                           "SC-6000 port I/O port region is already in use.\n");
                err = -EBUSY;
-               goto err_unmap2;
+               goto err_unmap1;
        }
        vmss_port = devm_ioport_map(devptr, mss_port[dev], 4);
        if (!vport) {
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to