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.3
[linux-2.6.git]
/
drivers
/
sbus
/
char
/
display7seg.c
diff --git
a/drivers/sbus/char/display7seg.c
b/drivers/sbus/char/display7seg.c
index
8d1a1e1
..
adb30d5
100644
(file)
--- a/
drivers/sbus/char/display7seg.c
+++ b/
drivers/sbus/char/display7seg.c
@@
-70,7
+70,7
@@
MODULE_SUPPORTED_DEVICE
* FLIP - Inverts display for upside-down mounted board
* bits 0-4 - 7-segment display contents
*/
* FLIP - Inverts display for upside-down mounted board
* bits 0-4 - 7-segment display contents
*/
-
volatile u8* d7s_regs = 0
;
+
static void __iomem* d7s_regs
;
static inline void d7s_free(void)
{
static inline void d7s_free(void)
{
@@
-128,7
+128,7
@@
static int d7s_ioctl(struct inode *inode, struct file *f,
/* assign device register values
* we mask-out D7S_FLIP if in sol_compat mode
*/
/* assign device register values
* we mask-out D7S_FLIP if in sol_compat mode
*/
- if (get_user(ireg, (int *) arg))
+ if (get_user(ireg, (int
__user
*) arg))
return -EFAULT;
if (0 != sol_compat) {
(regs & D7S_FLIP) ?
return -EFAULT;
if (0 != sol_compat) {
(regs & D7S_FLIP) ?
@@
-144,7
+144,7
@@
static int d7s_ioctl(struct inode *inode, struct file *f,
* This driver will not misinform you about the state
* of your hardware while in sol_compat mode
*/
* This driver will not misinform you about the state
* of your hardware while in sol_compat mode
*/
- if (put_user(regs, (int *) arg))
+ if (put_user(regs, (int
__user
*) arg))
return -EFAULT;
break;
return -EFAULT;
break;