From: Geert Uytterhoeven Date: Wed, 2 May 2007 12:48:32 +0000 (+0200) Subject: ps3fb: atomic fixes X-Git-Tag: v2.6.22-rc1~1047 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=eca28743b74736456bd75e0dabeb7d2df09fc03e;p=linux-2.6-omap-h63xx.git ps3fb: atomic fixes ps3fb: Use atomic_dec_if_positive() instead of bogus atomic_read()/atomic_dec() combinations Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds --- diff --git a/drivers/video/ps3fb.c b/drivers/video/ps3fb.c index 815b3cc78fd..dd6dd6e222d 100644 --- a/drivers/video/ps3fb.c +++ b/drivers/video/ps3fb.c @@ -680,13 +680,10 @@ EXPORT_SYMBOL_GPL(ps3fb_wait_for_vsync); void ps3fb_flip_ctl(int on) { - if (on) { - if (atomic_read(&ps3fb.ext_flip) > 0) { - atomic_dec(&ps3fb.ext_flip); - } - } else { + if (on) + atomic_dec_if_positive(&ps3fb.ext_flip); + else atomic_inc(&ps3fb.ext_flip); - } } EXPORT_SYMBOL_GPL(ps3fb_flip_ctl); @@ -786,8 +783,7 @@ static int ps3fb_ioctl(struct fb_info *info, unsigned int cmd, case PS3FB_IOCTL_OFF: DPRINTK("PS3FB_IOCTL_OFF:\n"); - if (atomic_read(&ps3fb.ext_flip) > 0) - atomic_dec(&ps3fb.ext_flip); + atomic_dec_if_positive(&ps3fb.ext_flip); retval = 0; break;