PCI: complain about devices that seem to be broken

[safe/jmp/linux-2.6] / drivers / media / video / dabusb.c

diff --git a/drivers/media/video/dabusb.c b/drivers/media/video/dabusb.c
index f40c676..0f50508 100644 (file)
--- a/drivers/media/video/dabusb.c
+++ b/drivers/media/video/dabusb.c
@@ -32,6 +32,7 @@
 #include <linux/list.h>
 #include <linux/vmalloc.h>
 #include <linux/slab.h>
+#include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <asm/uaccess.h>
 #include <asm/atomic.h>
@@ -334,7 +335,7 @@ static int dabusb_loadmem (pdabusb_t s, const char *fname)
 {
        int ret;
        const struct ihex_binrec *rec;
-       const struct firmware *fw;
+       const struct firmware *uninitialized_var(fw);
 
        dbg("Enter dabusb_loadmem (internal)");
 
@@ -615,10 +616,12 @@ static int dabusb_open (struct inode *inode, struct file *file)
 {
        int devnum = iminor(inode);
        pdabusb_t s;
+       int r;
 
        if (devnum < DABUSB_MINOR || devnum >= (DABUSB_MINOR + NRDABUSB))
                return -EIO;
 
+       lock_kernel();
        s = &dabusb[devnum - DABUSB_MINOR];
 
        dbg("dabusb_open");
@@ -633,6 +636,7 @@ static int dabusb_open (struct inode *inode, struct file *file)
                msleep_interruptible(500);
 
                if (signal_pending (current)) {
+                       unlock_kernel();
                        return -EAGAIN;
                }
                mutex_lock(&s->mutex);
@@ -640,6 +644,7 @@ static int dabusb_open (struct inode *inode, struct file *file)
        if (usb_set_interface (s->usbdev, _DABUSB_IF, 1) < 0) {
                mutex_unlock(&s->mutex);
                dev_err(&s->usbdev->dev, "set_interface failed\n");
+               unlock_kernel();
                return -EINVAL;
        }
        s->opened = 1;
@@ -648,7 +653,9 @@ static int dabusb_open (struct inode *inode, struct file *file)
        file->f_pos = 0;
        file->private_data = s;
 
-       return nonseekable_open(inode, file);
+       r = nonseekable_open(inode, file);
+       unlock_kernel();
+       return r;
 }
 
 static int dabusb_release (struct inode *inode, struct file *file)
@@ -673,7 +680,7 @@ static int dabusb_release (struct inode *inode, struct file *file)
        return 0;
 }
 
-static int dabusb_ioctl (struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
+static long dabusb_ioctl (struct file *file, unsigned int cmd, unsigned long arg)
 {
        pdabusb_t s = (pdabusb_t) file->private_data;
        pbulk_transfer_t pbulk;
@@ -682,13 +689,17 @@ static int dabusb_ioctl (struct inode *inode, struct file *file, unsigned int cm
 
        dbg("dabusb_ioctl");
 
-       if (s->remove_pending)
+       lock_kernel();
+       if (s->remove_pending) {
+               unlock_kernel();
                return -EIO;
+       }
 
        mutex_lock(&s->mutex);
 
        if (!s->usbdev) {
                mutex_unlock(&s->mutex);
+               unlock_kernel();
                return -EIO;
        }
 
@@ -729,6 +740,7 @@ static int dabusb_ioctl (struct inode *inode, struct file *file, unsigned int cm
                break;
        }
        mutex_unlock(&s->mutex);
+       unlock_kernel();
        return ret;
 }
 
@@ -737,13 +749,19 @@ static const struct file_operations dabusb_fops =
        .owner =        THIS_MODULE,
        .llseek =       no_llseek,
        .read =         dabusb_read,
-       .ioctl =        dabusb_ioctl,
+       .unlocked_ioctl =       dabusb_ioctl,
        .open =         dabusb_open,
        .release =      dabusb_release,
 };
 
+static char *dabusb_devnode(struct device *dev, mode_t *mode)
+{
+       return kasprintf(GFP_KERNEL, "usb/%s", dev_name(dev));
+}
+
 static struct usb_class_driver dabusb_class = {
        .name =         "dabusb%d",
+       .devnode =      dabusb_devnode,
        .fops =         &dabusb_fops,
        .minor_base =   DABUSB_MINOR,
 };
@@ -901,6 +919,8 @@ static void __exit dabusb_cleanup (void)
 MODULE_AUTHOR( DRIVER_AUTHOR );
 MODULE_DESCRIPTION( DRIVER_DESC );
 MODULE_LICENSE("GPL");
+MODULE_FIRMWARE("dabusb/firmware.fw");
+MODULE_FIRMWARE("dabusb/bitstream.bin");
 
 module_param(buffers, int, 0);
 MODULE_PARM_DESC (buffers, "Number of buffers (default=256)");