Changeset 426 for GPL/trunk/alsa-kernel/isa/wavefront

Timestamp:

May 9, 2009, 11:45:26 AM (16 years ago)

Author:

Paul Smedley

Message:

Update alsa-kernel to ALSA 1.0.20 level

Location:

GPL/trunk/alsa-kernel/isa/wavefront

Files:

• wavefront.c (modified) (1 diff)
• wavefront_fx.c (modified) (5 diffs)
• wavefront_synth.c (modified) (2 diffs)

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

@@ -554 +554 @@
 #endif
         if (cs4232_pcm_port[dev] == SNDRV_AUTO_PORT) {
-                snd_printk("specify CS4232 port\n");
+                snd_printk(KERN_ERR "specify CS4232 port\n");
                 return 0;
         }
         if (ics2115_port[dev] == SNDRV_AUTO_PORT) {
-                snd_printk("specify ICS2115 port\n");
+                snd_printk(KERN_ERR "specify ICS2115 port\n");
                 return 0;
         }

GPL/trunk/alsa-kernel/isa/wavefront/wavefront_fx.c

@@ -35 +35 @@
 #define WAIT_IDLE       0xff
 
-#ifdef CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL
-#include "yss225.c"
-static const struct firmware yss225_registers_firmware = {
-        .data = (u8 *)yss225_registers,
-        .size = sizeof yss225_registers
-};
-#endif
-
 static int
 wavefront_fx_idle (snd_wavefront_t *dev)
@@ -211 +203 @@
                                 return -EIO;
                         }
-                        page_data = kmalloc(r.data[2] * sizeof(short), GFP_KERNEL);
-                        if (!page_data)
-                                return -ENOMEM;
-                        if (copy_from_user (page_data,
-                                            (unsigned char __user *) r.data[3],
-                                            r.data[2] * sizeof(short))) {
-                                kfree(page_data);
-                                return -EFAULT;
-                        }
+                        page_data = memdup_user((unsigned char __user *)
+                                                r.data[3],
+                                                r.data[2] * sizeof(short));
+                        if (IS_ERR(page_data))
+                                return PTR_ERR(page_data);
                         pd = page_data;
                 }
@@ -261 +249 @@
                 return 0;
 
-#ifdef CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL
-        firmware = &yss225_registers_firmware;
-#else
         err = request_firmware(&firmware, "yamaha/yss225_registers.bin",
                                dev->card->dev);
@@ -270 +255 @@
                 goto out;
         }
-#endif
 
         for (i = 0; i + 1 < firmware->size; i += 2) {
@@ -293 +277 @@
 
 out:
-#ifndef CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL
         release_firmware(firmware);
-#endif
         return err;
 }
 
-#ifndef CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL
 MODULE_FIRMWARE("yamaha/yss225_registers.bin");
-#endif

GPL/trunk/alsa-kernel/isa/wavefront/wavefront_synth.c

@@ -636 +636 @@
 
                 if (snd_wavefront_cmd (dev, WFC_IDENTIFY_SAMPLE_TYPE, rbuf, wbuf)) {
-                        snd_printk("cannot identify sample "
+                        snd_printk(KERN_WARNING "cannot identify sample "
                                    "type of slot %d\n", i);
                         dev->sample_status[i] = WF_ST_EMPTY;
@@ -1668 +1668 @@
 
         case WFCTL_WFCMD:
-                wc = kmalloc(sizeof(*wc), GFP_KERNEL);
-                if (! wc)
-                        return -ENOMEM;
-                if (copy_from_user (wc, argp, sizeof (*wc)))
-                        err = -EFAULT;
-                else if (wavefront_synth_control (acard, wc) < 0)
+                wc = memdup_user(argp, sizeof(*wc));
+                if (IS_ERR(wc))
+                        return PTR_ERR(wc);
+
+                if (wavefront_synth_control (acard, wc) < 0)
                         err = -EIO;
                 else if (copy_to_user (argp, wc, sizeof (*wc)))