patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / media / video / cpia_usb.c

diff --git a/drivers/media/video/cpia_usb.c b/drivers/media/video/cpia_usb.c
index 6b602be..0bf9349 100644 (file)
--- a/drivers/media/video/cpia_usb.c
+++ b/drivers/media/video/cpia_usb.c
@@ -499,7 +499,7 @@ static int cpia_probe(struct usb_interface *intf,
        if (udev->descriptor.bNumConfigurations != 1)
                return -ENODEV;
 
-       interface = &intf->altsetting[0];
+       interface = intf->cur_altsetting;
 
        printk(KERN_INFO "USB CPiA camera found\n");
 
@@ -620,8 +620,6 @@ static void cpia_disconnect(struct usb_interface *intf)
                wake_up_interruptible(&ucpia->wq_stream);
 
        udev = interface_to_usbdev(intf);
-       usb_driver_release_interface(&cpia_driver,
-                                    udev->actconfig->interface[0]);
 
        ucpia->curbuff = ucpia->workbuff = NULL;