diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-06 22:11:17 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-06 22:11:17 -0400 |
| commit | 12e94471b2be5ef9b55b10004a3a2cd819490036 (patch) | |
| tree | f84ae818687dc7c35bd54f11bfb9717278d28a4e /drivers/video/sis/sis_main.c | |
| parent | 79315068f4560f3f7bd6e9790190dcb43059770c (diff) | |
| parent | cb655d0f3d57c23db51b981648e452988c0223f9 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/video/sis/sis_main.c')
| -rw-r--r-- | drivers/video/sis/sis_main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c index 559bf1727a2b..b52f8e4ef1fd 100644 --- a/drivers/video/sis/sis_main.c +++ b/drivers/video/sis/sis_main.c | |||
| @@ -1701,6 +1701,9 @@ static int sisfb_ioctl(struct fb_info *info, unsigned int cmd, | |||
| 1701 | break; | 1701 | break; |
| 1702 | 1702 | ||
| 1703 | case FBIOGET_VBLANK: | 1703 | case FBIOGET_VBLANK: |
| 1704 | |||
| 1705 | memset(&sisvbblank, 0, sizeof(struct fb_vblank)); | ||
| 1706 | |||
| 1704 | sisvbblank.count = 0; | 1707 | sisvbblank.count = 0; |
| 1705 | sisvbblank.flags = sisfb_setupvbblankflags(ivideo, &sisvbblank.vcount, &sisvbblank.hcount); | 1708 | sisvbblank.flags = sisfb_setupvbblankflags(ivideo, &sisvbblank.vcount, &sisvbblank.hcount); |
| 1706 | 1709 | ||