git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
video
/
aty
/
atyfb_base.c
diff --git
a/drivers/video/aty/atyfb_base.c
b/drivers/video/aty/atyfb_base.c
index
5e7c2d2
..
37177be
100644
(file)
--- a/
drivers/video/aty/atyfb_base.c
+++ b/
drivers/video/aty/atyfb_base.c
@@
-1037,7
+1037,7
@@
static int atyfb_ioctl(struct inode *inode, struct file *file, u_int cmd,
fbtyp.fb_cmsize = info->cmap.len;
fbtyp.fb_size = info->fix.smem_len;
if (copy_to_user
fbtyp.fb_cmsize = info->cmap.len;
fbtyp.fb_size = info->fix.smem_len;
if (copy_to_user
- ((struct fbtype *) arg, &fbtyp, sizeof(fbtyp)))
+ ((struct fbtype
__user
*) arg, &fbtyp, sizeof(fbtyp)))
return -EFAULT;
break;
#endif /* __sparc__ */
return -EFAULT;
break;
#endif /* __sparc__ */
@@
-1405,7
+1405,7
@@
static int aty_sleep_notify(struct pmu_sleep_notifier *self, int when)
case PBOOK_SLEEP_REJECT:
if (par->save_framebuffer) {
vfree(par->save_framebuffer);
case PBOOK_SLEEP_REJECT:
if (par->save_framebuffer) {
vfree(par->save_framebuffer);
- par->save_framebuffer =
0
;
+ par->save_framebuffer =
NULL
;
}
break;
case PBOOK_SLEEP_NOW:
}
break;
case PBOOK_SLEEP_NOW:
@@
-1435,7
+1435,7
@@
static int aty_sleep_notify(struct pmu_sleep_notifier *self, int when)
memcpy_toio((void *) info->screen_base,
par->save_framebuffer, nb);
vfree(par->save_framebuffer);
memcpy_toio((void *) info->screen_base,
par->save_framebuffer, nb);
vfree(par->save_framebuffer);
- par->save_framebuffer =
0
;
+ par->save_framebuffer =
NULL
;
}
/* Restore display */
atyfb_set_par(info);
}
/* Restore display */
atyfb_set_par(info);