upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[linux-2.6.git] / drivers / usb / misc / emi26.c

diff --git a/drivers/usb/misc/emi26.c b/drivers/usb/misc/emi26.c
index cd37e01..c815520 100644 (file)
--- a/drivers/usb/misc/emi26.c
+++ b/drivers/usb/misc/emi26.c
@@ -30,6 +30,7 @@ typedef struct _INTEL_HEX_RECORD
 
 #define EMI26_VENDOR_ID                0x086a  /* Emagic Soft-und Hardware GmBH */
 #define EMI26_PRODUCT_ID               0x0100  /* EMI 2|6 without firmware */
+#define EMI26B_PRODUCT_ID              0x0102  /* EMI 2|6 without firmware */
 
 #define ANCHOR_LOAD_INTERNAL   0xA0    /* Vendor specific request code for Anchor Upload/Download (This one is implemented in the core) */
 #define ANCHOR_LOAD_EXTERNAL   0xA3    /* This command is not implemented in the core. Requires firmware */
@@ -203,6 +204,7 @@ wraperr:
 
 static struct usb_device_id id_table [] = {
        { USB_DEVICE(EMI26_VENDOR_ID, EMI26_PRODUCT_ID) },
+       { USB_DEVICE(EMI26_VENDOR_ID, EMI26B_PRODUCT_ID) },
        { }                                             /* Terminating entry */
 };
 
@@ -213,11 +215,9 @@ static int emi26_probe(struct usb_interface *intf, const struct usb_device_id *i
        struct usb_device *dev = interface_to_usbdev(intf);
 
        info("%s start", __FUNCTION__); 
-       
-       if((dev->descriptor.idVendor == EMI26_VENDOR_ID) && (dev->descriptor.idProduct == EMI26_PRODUCT_ID)) {
-               emi26_load_firmware(dev);
-       }
-       
+
+       emi26_load_firmware(dev);
+
        /* do not return the driver context, let real audio driver do that */
        return -EIO;
 }