Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into avr32-arch

1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c
index 0f5c05f6f9df..c40a9b284cc9 100644
--- a/drivers/usb/class/usbtmc.c
+++ b/drivers/usb/class/usbtmc.c
@@ -50,6 +50,7 @@
 
 static struct usb_device_id usbtmc_devices[] = {
         { USB_INTERFACE_INFO(USB_CLASS_APP_SPEC, 3, 0), },
+        { USB_INTERFACE_INFO(USB_CLASS_APP_SPEC, 3, 1), },
         { 0, } /* terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, usbtmc_devices);
@@ -106,12 +107,13 @@ static int usbtmc_open(struct inode *inode, struct file *filp)
 {
         struct usb_interface *intf;
         struct usbtmc_device_data *data;
-        int retval = -ENODEV;
+        int retval = 0;
 
         intf = usb_find_interface(&usbtmc_driver, iminor(inode));
         if (!intf) {
                 printk(KERN_ERR KBUILD_MODNAME
                        ": can not find device for minor %d", iminor(inode));
+                retval = -ENODEV;
                 goto exit;
         }