diff options
| author |   Hans Verkuil <hans.verkuil@cisco.com> | 2015-07-20 10:18:20 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-08-11 07:00:39 -0300 |
| commit | 7b962d43ef875f3a524e92ca944816b862470e21 (patch) | |
| tree | f5a6d00cd4f343d2823b95264a1b542a433fc1b7 /drivers/media/pci/zoran/zoran.h | |
| parent | [media] zoran: remove unused read/write functions (diff) | |
| download | linux-dev-7b962d43ef875f3a524e92ca944816b862470e21.tar.xz linux-dev-7b962d43ef875f3a524e92ca944816b862470e21.zip | |
[media] zoran: use standard core lock
Use the standard core lock to take care of serializing ioctl calls and
to serialize file operations.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/pci/zoran/zoran.h')
| -rw-r--r-- | drivers/media/pci/zoran/zoran.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/pci/zoran/zoran.h b/drivers/media/pci/zoran/zoran.h index 5e040085c2ff..4109775e4c74 100644 --- a/drivers/media/pci/zoran/zoran.h +++ b/drivers/media/pci/zoran/zoran.h @@ -280,8 +280,7 @@ struct zoran { struct videocodec *codec; /* video codec */ struct videocodec *vfe; /* video front end */ - struct mutex resource_lock; /* prevent evil stuff */ - struct mutex other_lock; /* please merge with above */ + struct mutex lock; /* file ops serialize lock */ u8 initialized; /* flag if zoran has been correctly initialized */ int user; /* number of current users */ |