From c762f5db38cd8071320298bebc6a755c806b7327 Mon Sep 17 00:00:00 2001 From: Chris Rankin Date: Sun, 25 Sep 2011 18:43:12 -0300 Subject: [PATCH] --- yaml --- r: 271923 b: refs/heads/master c: 778f295080b62cbce1af402e1704566531e01233 h: refs/heads/master i: 271921: 187e23e8651c36be13da9b01b22a94946641030f 271919: 0302def121e78bb998203bf8a88f6f9881d10743 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/em28xx/em28xx-cards.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e2481d241e11..dd3c61003708 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f055815fd0e4dd22ffd523f0e5117132c0a49e3d +refs/heads/master: 778f295080b62cbce1af402e1704566531e01233 diff --git a/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/drivers/media/video/em28xx/em28xx-cards.c index 2e1c1214c38f..4240f0b720fa 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-cards.c +++ b/trunk/drivers/media/video/em28xx/em28xx-cards.c @@ -3005,10 +3005,6 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev, goto fail; } - mutex_unlock(&dev->lock); - em28xx_init_extension(dev); - mutex_lock(&dev->lock); - /* Save some power by putting tuner to sleep */ v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_power, 0); @@ -3243,6 +3239,13 @@ static int em28xx_usb_probe(struct usb_interface *interface, */ mutex_unlock(&dev->lock); + /* + * These extensions can be modules. If the modules are already + * loaded then we can initialise the device now, otherwise we + * will initialise it when the modules load instead. + */ + em28xx_init_extension(dev); + return 0; err: