Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 53306
b: refs/heads/master
c: eca2874
h: refs/heads/master
v: v3
  • Loading branch information
Geert Uytterhoeven authored and Linus Torvalds committed May 5, 2007
1 parent 2c49b1b commit f62af85
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1c0c8461191d6d74926397abe2aa5f7cc9fd5a67
refs/heads/master: eca28743b74736456bd75e0dabeb7d2df09fc03e
12 changes: 4 additions & 8 deletions trunk/drivers/video/ps3fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit f62af85

Please sign in to comment.