leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

V4L/DVB: cafe_ccic: Fix lock imbalances

Browse Source 
Fix lock imbalances in function device_authorization.

Signed-off-by: Alexander Strakh <strakh@ispras.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Alexander Strakh 2009-09-11 15:13:21 -03:00 committed by Mauro Carvalho Chehab
parent fb3ab105a5
commit 0faf6f6b89
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/video/cafe_ccic.c
View File

@ -1907,7 +1907,6 @@ static int cafe_pci_probe(struct pci_dev *pdev,
goto out_free; goto out_free;
mutex_init(&cam->s_mutex); mutex_init(&cam->s_mutex);
mutex_lock(&cam->s_mutex);
spin_lock_init(&cam->dev_lock); spin_lock_init(&cam->dev_lock);
cam->state = S_NOTREADY; cam->state = S_NOTREADY;
cafe_set_config_needed(cam, 1); 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 * because the sensor could attach in this call chain, leading to
* unsightly deadlocks. * unsightly deadlocks.
*/ */
mutex_unlock(&cam->s_mutex); /* attach can deadlock */
ret = cafe_smbus_setup(cam); ret = cafe_smbus_setup(cam);
if (ret) if (ret)
goto out_freeirq; goto out_freeirq;
@ -1973,7 +1971,7 @@ static int cafe_pci_probe(struct pci_dev *pdev,
cam->vdev.v4l2_dev = &cam->v4l2_dev; cam->vdev.v4l2_dev = &cam->v4l2_dev;
ret = video_register_device(&cam->vdev, VFL_TYPE_GRABBER, -1); ret = video_register_device(&cam->vdev, VFL_TYPE_GRABBER, -1);
if (ret) if (ret)
goto out_smbus; goto out_unlock;
video_set_drvdata(&cam->vdev, cam); video_set_drvdata(&cam->vdev, cam);
/* /*
@ -1988,6 +1986,8 @@ static int cafe_pci_probe(struct pci_dev *pdev,
mutex_unlock(&cam->s_mutex); mutex_unlock(&cam->s_mutex);
return 0; return 0;
out_unlock:
mutex_unlock(&cam->s_mutex);
out_smbus: out_smbus:
cafe_smbus_shutdown(cam); cafe_smbus_shutdown(cam);
out_freeirq: out_freeirq: