git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
[pandora-kernel.git]
/
drivers
/
char
/
briq_panel.c
diff --git
a/drivers/char/briq_panel.c
b/drivers/char/briq_panel.c
index
a0e5eac
..
8dcf9d2
100644
(file)
--- a/
drivers/char/briq_panel.c
+++ b/
drivers/char/briq_panel.c
@@
-8,10
+8,8
@@
#include <linux/types.h>
#include <linux/errno.h>
#include <linux/types.h>
#include <linux/errno.h>
-#include <linux/sched.h>
#include <linux/tty.h>
#include <linux/timer.h>
#include <linux/tty.h>
#include <linux/timer.h>
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/wait.h>
#include <linux/string.h>
#include <linux/kernel.h>
#include <linux/wait.h>
#include <linux/string.h>
@@
-87,7
+85,7
@@
static int briq_panel_release(struct inode *ino, struct file *filep)
return 0;
}
return 0;
}
-static ssize_t briq_panel_read(struct file *file, char *buf, size_t count,
+static ssize_t briq_panel_read(struct file *file, char
__user
*buf, size_t count,
loff_t *ppos)
{
unsigned short c;
loff_t *ppos)
{
unsigned short c;
@@
-135,7
+133,7
@@
static void scroll_vfd( void )
vfd_cursor = 20;
}
vfd_cursor = 20;
}
-static ssize_t briq_panel_write(struct file *file, const char *buf, size_t len,
+static ssize_t briq_panel_write(struct file *file, const char
__user
*buf, size_t len,
loff_t *ppos)
{
size_t indx = len;
loff_t *ppos)
{
size_t indx = len;
@@
-150,19
+148,22
@@
static ssize_t briq_panel_write(struct file *file, const char *buf, size_t len,
return -EBUSY;
for (;;) {
return -EBUSY;
for (;;) {
+ char c;
if (!indx)
break;
if (!indx)
break;
+ if (get_user(c, buf))
+ return -EFAULT;
if (esc) {
if (esc) {
- set_led(
*buf
);
+ set_led(
c
);
esc = 0;
esc = 0;
- } else if (
*buf
== 27) {
+ } else if (
c
== 27) {
esc = 1;
esc = 1;
- } else if (
*buf
== 12) {
+ } else if (
c
== 12) {
/* do a form feed */
for (i=0; i<40; i++)
vfd[i] = ' ';
vfd_cursor = 0;
/* do a form feed */
for (i=0; i<40; i++)
vfd[i] = ' ';
vfd_cursor = 0;
- } else if (
*buf
== 10) {
+ } else if (
c
== 10) {
if (vfd_cursor < 20)
vfd_cursor = 20;
else if (vfd_cursor < 40)
if (vfd_cursor < 20)
vfd_cursor = 20;
else if (vfd_cursor < 40)
@@
-175,7
+176,7
@@
static ssize_t briq_panel_write(struct file *file, const char *buf, size_t len,
/* just a character */
if (vfd_cursor > 39)
scroll_vfd();
/* just a character */
if (vfd_cursor > 39)
scroll_vfd();
- vfd[vfd_cursor++] =
*buf
;
+ vfd[vfd_cursor++] =
c
;
}
indx--;
buf++;
}
indx--;
buf++;
@@
-185,7
+186,7
@@
static ssize_t briq_panel_write(struct file *file, const char *buf, size_t len,
return len;
}
return len;
}
-static struct file_operations briq_panel_fops = {
+static
const
struct file_operations briq_panel_fops = {
.owner = THIS_MODULE,
.read = briq_panel_read,
.write = briq_panel_write,
.owner = THIS_MODULE,
.read = briq_panel_read,
.write = briq_panel_write,
@@
-202,7
+203,7
@@
static struct miscdevice briq_panel_miscdev = {
static int __init briq_panel_init(void)
{
struct device_node *root = find_path_device("/");
static int __init briq_panel_init(void)
{
struct device_node *root = find_path_device("/");
- char *machine;
+ c
onst c
har *machine;
int i;
machine = get_property(root, "model", NULL);
int i;
machine = get_property(root, "model", NULL);