[PATCH] Fix error path in kahlua driver

Memory leak fix: hw_config is allocated before the call to sb_dsp_detect.

diff --git a/sound/oss/kahlua.c b/sound/oss/kahlua.c
index 94786206ffae733aa03fae5578be2c745afa8378..f8b37cb8811633031f34633b6c4ee237a31fa451 100644 (file)
--- a/sound/oss/kahlua.c
+++ b/sound/oss/kahlua.c
@@ -159,7 +159,7 @@ static int __devinit probe_one(struct pci_dev *pdev, const struct pci_device_id
        if(sb_dsp_detect(hw_config, 0, 0, NULL)==0)
        {
                printk(KERN_ERR "kahlua: audio not responding.\n");
-               return 1;
+               goto err_out_free;
        }
 
        oldquiet = sb_be_quiet; 
@@ -167,13 +167,16 @@ static int __devinit probe_one(struct pci_dev *pdev, const struct pci_device_id
        if(sb_dsp_init(hw_config, THIS_MODULE))
        {
                sb_be_quiet = oldquiet;
-               pci_set_drvdata(pdev, NULL);
-               kfree(hw_config);
-               return 1;
+               goto err_out_free;
        }
        sb_be_quiet = oldquiet;
        
        return 0;
+
+err_out_free:
+       pci_set_drvdata(pdev, NULL);
+       kfree(hw_config);
+       return 1;
 }
 
 static void __devexit remove_one(struct pci_dev *pdev)