patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / usb / media / pwc-if.c

diff --git a/drivers/usb/media/pwc-if.c b/drivers/usb/media/pwc-if.c
index cbdf7d2..aea703b 100644 (file)
--- a/drivers/usb/media/pwc-if.c
+++ b/drivers/usb/media/pwc-if.c
@@ -129,7 +129,6 @@ static struct {
 
 static int pwc_video_open(struct inode *inode, struct file *file);
 static int pwc_video_close(struct inode *inode, struct file *file);
-static int pwc_video_release(struct video_device *);                     
 static ssize_t pwc_video_read(struct file *file, char *buf,
                          size_t count, loff_t *ppos);
 static unsigned int pwc_video_poll(struct file *file, poll_table *wait);
@@ -789,7 +788,8 @@ static int pwc_isoc_init(struct pwc_device *pdev)
        struct urb *urb;
        int i, j, ret;
 
-       struct usb_host_interface *idesc;
+       struct usb_interface *intf;
+       struct usb_host_interface *idesc = NULL;
 
        if (pdev == NULL)
                return -EFAULT;
@@ -801,7 +801,9 @@ static int pwc_isoc_init(struct pwc_device *pdev)
        /* Get the current alternate interface, adjust packet size */
        if (!udev->actconfig)
                return -EFAULT;
-       idesc = &udev->actconfig->interface[0]->altsetting[pdev->valternate];
+       intf = usb_ifnum_to_if(udev, 0);
+       if (intf)
+               idesc = usb_altnum_to_altsetting(intf, pdev->valternate);
        if (!idesc)
                return -EFAULT;
 
@@ -1118,12 +1120,6 @@ static int pwc_video_close(struct inode *inode, struct file *file)
        return 0;
 }
 
-static int pwc_video_release(struct video_device *vfd)
-{
-       Trace(TRACE_OPEN, "pwc_video_release() called. Now what?\n");
-}
-               
-
 /*
  *     FIXME: what about two parallel reads ????
  *      ANSWER: Not supported. You can't open the device more than once,
@@ -1852,7 +1848,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
                }
        }
 
-       pdev->vdev.release = pwc_video_release;
+       pdev->vdev.release = video_device_release;
        i = video_register_device(&pdev->vdev, VFL_TYPE_GRABBER, video_nr);
        if (i < 0) {
                Err("Failed to register as video device (%d).\n", i);