aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 897a4320d9d5..ebfb7a3beab2 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -2916,11 +2916,10 @@ void em28xx_release_resources(struct em28xx *dev)
2916 * em28xx_init_dev() 2916 * em28xx_init_dev()
2917 * allocates and inits the device structs, registers i2c bus and v4l device 2917 * allocates and inits the device structs, registers i2c bus and v4l device
2918 */ 2918 */
2919static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev, 2919static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev,
2920 struct usb_interface *interface, 2920 struct usb_interface *interface,
2921 int minor) 2921 int minor)
2922{ 2922{
2923 struct em28xx *dev = *devhandle;
2924 int retval; 2923 int retval;
2925 2924
2926 dev->udev = udev; 2925 dev->udev = udev;
@@ -3302,7 +3301,7 @@ static int em28xx_usb_probe(struct usb_interface *interface,
3302 /* allocate device struct */ 3301 /* allocate device struct */
3303 mutex_init(&dev->lock); 3302 mutex_init(&dev->lock);
3304 mutex_lock(&dev->lock); 3303 mutex_lock(&dev->lock);
3305 retval = em28xx_init_dev(&dev, udev, interface, nr); 3304 retval = em28xx_init_dev(dev, udev, interface, nr);
3306 if (retval) { 3305 if (retval) {
3307 goto unlock_and_free; 3306 goto unlock_and_free;
3308 } 3307 }