Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[sfrench/cifs-2.6.git] / sound / usb / usx2y / usX2Yhwdep.c

diff --git a/sound/usb/usx2y/usX2Yhwdep.c b/sound/usb/usx2y/usX2Yhwdep.c
index 8b0a1eae573c046029d58402dc4470543b67199c..07d15bae75bceb8efa5c211a248bdb8551d902cc 100644 (file)
--- a/sound/usb/usx2y/usX2Yhwdep.c
+++ b/sound/usb/usx2y/usX2Yhwdep.c
@@ -198,24 +198,22 @@ static int snd_usX2Y_hwdep_dsp_load(struct snd_hwdep *hw,
                                    struct snd_hwdep_dsp_image *dsp)
 {
        struct usX2Ydev *priv = hw->private_data;
-       int     lret, err = -EINVAL;
-       snd_printdd( "dsp_load %s\n", dsp->name);
+       struct usb_device* dev = priv->dev;
+       int lret, err;
+       char *buf;
 
-       if (access_ok(VERIFY_READ, dsp->image, dsp->length)) {
-               struct usb_device* dev = priv->dev;
-               char *buf;
+       snd_printdd( "dsp_load %s\n", dsp->name);
 
-               buf = memdup_user(dsp->image, dsp->length);
-               if (IS_ERR(buf))
-                       return PTR_ERR(buf);
+       buf = memdup_user(dsp->image, dsp->length);
+       if (IS_ERR(buf))
+               return PTR_ERR(buf);
 
-               err = usb_set_interface(dev, 0, 1);
-               if (err)
-                       snd_printk(KERN_ERR "usb_set_interface error \n");
-               else
-                       err = usb_bulk_msg(dev, usb_sndbulkpipe(dev, 2), buf, dsp->length, &lret, 6000);
-               kfree(buf);
-       }
+       err = usb_set_interface(dev, 0, 1);
+       if (err)
+               snd_printk(KERN_ERR "usb_set_interface error \n");
+       else
+               err = usb_bulk_msg(dev, usb_sndbulkpipe(dev, 2), buf, dsp->length, &lret, 6000);
+       kfree(buf);
        if (err)
                return err;
        if (dsp->index == 1) {