diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-14 09:33:19 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-14 09:33:19 -0200 |
| commit | 00c063c6b673bc8386936219c7eb239bbe353114 (patch) | |
| tree | b903332682b0f048c4854d5d1df6d966bb7044c9 /linux | |
| parent | 469a8947e8aa139028418cffff8234abdbaf2b0d (diff) | |
| parent | 6494d36c801e81065cdfe9d1bf2b61b92e66111e (diff) | |
| download | mediapointer-dvb-s2-00c063c6b673bc8386936219c7eb239bbe353114.tar.gz mediapointer-dvb-s2-00c063c6b673bc8386936219c7eb239bbe353114.tar.bz2 | |
merge: http://linuxtv.org/hg/~rmcc/blackbird/
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-mpeg.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-mpeg.c b/linux/drivers/media/video/cx88/cx88-mpeg.c index 399c3f1fc..1f641273c 100644 --- a/linux/drivers/media/video/cx88/cx88-mpeg.c +++ b/linux/drivers/media/video/cx88/cx88-mpeg.c @@ -673,8 +673,8 @@ static int cx8802_request_acquire(struct cx8802_driver *drv) if (drv->advise_acquire) { - core->active_ref++; mutex_lock(&drv->core->lock); + core->active_ref++; if (core->active_type_id == CX88_BOARD_NONE) { core->active_type_id = drv->type_id; drv->advise_acquire(drv); @@ -692,14 +692,14 @@ static int cx8802_request_release(struct cx8802_driver *drv) { struct cx88_core *core = drv->core; + mutex_lock(&drv->core->lock); if (drv->advise_release && --core->active_ref == 0) { - mutex_lock(&drv->core->lock); drv->advise_release(drv); core->active_type_id = CX88_BOARD_NONE; - mutex_unlock(&drv->core->lock); mpeg_dbg(1,"%s() Post release GPIO=%x\n", __FUNCTION__, cx_read(MO_GP0_IO)); } + mutex_unlock(&drv->core->lock); return 0; } |