Changeset 695 for GPL/trunk/alsa-kernel/isa/cmi8330.c

Timestamp:

Aug 21, 2021, 3:35:34 AM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/isa/cmi8330.c (modified) (3 diffs)

GPL/trunk/alsa-kernel/isa/cmi8330.c

@@ -52 +52 @@
 MODULE_DESCRIPTION("C-Media CMI8330/CMI8329");
 MODULE_LICENSE("GPL");
-MODULE_SUPPORTED_DEVICE("{{C-Media,CMI8330,isapnp:{CMI0001,@@@0001,@X@0001}}}");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
@@ -549 +548 @@
         if (acard->sb->hardware != SB_HW_16) {
                 snd_printk(KERN_ERR PFX "SB16 not found during probe\n");
-                return err;
+                return -ENODEV;
         }
 
@@ -632 +631 @@
 }
 
-static int snd_cmi8330_isa_remove(struct device *devptr,
+static void snd_cmi8330_isa_remove(struct device *devptr,
                                   unsigned int dev)
 {
         snd_card_free(dev_get_drvdata(devptr));
-        return 0;
 }