From 43c0732a8ab6a4ae37a443a15a2287755386d326 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 7 Jan 2012 10:18:45 -0300 Subject: [PATCH] --- yaml --- r: 285777 b: refs/heads/master c: 622c2fc1f2613bef953d2af908e7b83f4de4b994 h: refs/heads/master i: 285775: 305087797ae9221d8550be7f67c7f3d779af159b v: v3 --- [refs] | 2 +- trunk/drivers/media/video/em28xx/em28xx-cards.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0f41a6b47101..8854cc24557e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d07b901f9dc22977c2c04f320a9cef19e5298e7e +refs/heads/master: 622c2fc1f2613bef953d2af908e7b83f4de4b994 diff --git a/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/drivers/media/video/em28xx/em28xx-cards.c index 897a4320d9d5..ebfb7a3beab2 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-cards.c +++ b/trunk/drivers/media/video/em28xx/em28xx-cards.c @@ -2916,11 +2916,10 @@ void em28xx_release_resources(struct em28xx *dev) * em28xx_init_dev() * allocates and inits the device structs, registers i2c bus and v4l device */ -static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev, +static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev, struct usb_interface *interface, int minor) { - struct em28xx *dev = *devhandle; int retval; dev->udev = udev; @@ -3302,7 +3301,7 @@ static int em28xx_usb_probe(struct usb_interface *interface, /* allocate device struct */ mutex_init(&dev->lock); mutex_lock(&dev->lock); - retval = em28xx_init_dev(&dev, udev, interface, nr); + retval = em28xx_init_dev(dev, udev, interface, nr); if (retval) { goto unlock_and_free; }