V4L/DVB: cafe_ccic: Fix lock imbalances

Fix lock imbalances in function device_authorization.

Signed-off-by: Alexander Strakh <strakh@ispras.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
index 7bb9c1ec7819fc7b6d83076b98fb8eae41ede5f8..cbbf7e80d2cf856b5de2aed6ab6ca4d14b8d76f9 100644 (file)
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
@@ -1907,7 +1907,6 @@ static int cafe_pci_probe(struct pci_dev *pdev,
                goto out_free;
 
        mutex_init(&cam->s_mutex);
-       mutex_lock(&cam->s_mutex);
        spin_lock_init(&cam->dev_lock);
        cam->state = S_NOTREADY;
        cafe_set_config_needed(cam, 1);
@@ -1947,7 +1946,6 @@ static int cafe_pci_probe(struct pci_dev *pdev,
         * because the sensor could attach in this call chain, leading to
         * unsightly deadlocks.
         */
-       mutex_unlock(&cam->s_mutex);  /* attach can deadlock */
        ret = cafe_smbus_setup(cam);
        if (ret)
                goto out_freeirq;
@@ -1973,7 +1971,7 @@ static int cafe_pci_probe(struct pci_dev *pdev,
        cam->vdev.v4l2_dev = &cam->v4l2_dev;
        ret = video_register_device(&cam->vdev, VFL_TYPE_GRABBER, -1);
        if (ret)
-               goto out_smbus;
+               goto out_unlock;
        video_set_drvdata(&cam->vdev, cam);
 
        /*
@@ -1988,6 +1986,8 @@ static int cafe_pci_probe(struct pci_dev *pdev,
        mutex_unlock(&cam->s_mutex);
        return 0;
 
+out_unlock:
+       mutex_unlock(&cam->s_mutex);
 out_smbus:
        cafe_smbus_shutdown(cam);
 out_freeirq: