From 1d272a061bc4020ee8cec3447b4344b4cfde1f1b Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Sun, 1 May 2011 06:31:40 -0300 Subject: [PATCH] --- yaml --- r: 250235 b: refs/heads/master c: 8d115931622eb19a15f2633cb35dd2c4a66db255 h: refs/heads/master i: 250233: a3070092760f1f66f5cebacc7ff12a52a71ec685 250231: 023ca3853d2adda8a2533ba97912de489ecdc0e8 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx88/cx88-video.c | 5 +++-- trunk/drivers/media/video/cx88/cx88.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 869d8effab30..9b75dde12095 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4bd4be8d113534a28e0c9a86cddbabd47b06159 +refs/heads/master: 8d115931622eb19a15f2633cb35dd2c4a66db255 diff --git a/trunk/drivers/media/video/cx88/cx88-video.c b/trunk/drivers/media/video/cx88/cx88-video.c index b1f734dccea0..cef4f282e5aa 100644 --- a/trunk/drivers/media/video/cx88/cx88-video.c +++ b/trunk/drivers/media/video/cx88/cx88-video.c @@ -824,7 +824,7 @@ static int video_open(struct file *file) call_all(core, tuner, s_radio); } - atomic_inc(&core->users); + core->users++; mutex_unlock(&core->lock); return 0; @@ -922,7 +922,8 @@ static int video_release(struct file *file) file->private_data = NULL; kfree(fh); - if(atomic_dec_and_test(&dev->core->users)) + dev->core->users--; + if (!dev->core->users) call_all(dev->core, core, s_power, 0); mutex_unlock(&dev->core->lock); diff --git a/trunk/drivers/media/video/cx88/cx88.h b/trunk/drivers/media/video/cx88/cx88.h index 9e8176ecf648..a399a8b086ba 100644 --- a/trunk/drivers/media/video/cx88/cx88.h +++ b/trunk/drivers/media/video/cx88/cx88.h @@ -389,7 +389,7 @@ struct cx88_core { struct mutex lock; /* various v4l controls */ u32 freq; - atomic_t users; + int users; int mpeg_users; /* cx88-video needs to access cx8802 for hybrid tuner pll access. */