git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rwsem generic spinlock: use IRQ save/restore spinlocks
[safe/jmp/linux-2.6]
/
drivers
/
video
/
output.c
diff --git
a/drivers/video/output.c
b/drivers/video/output.c
index
f2df551
..
0d6f2cd
100644
(file)
--- a/
drivers/video/output.c
+++ b/
drivers/video/output.c
@@
-23,6
+23,7
@@
*/
#include <linux/module.h>
#include <linux/video_output.h>
*/
#include <linux/module.h>
#include <linux/video_output.h>
+#include <linux/slab.h>
#include <linux/err.h>
#include <linux/ctype.h>
#include <linux/err.h>
#include <linux/ctype.h>
@@
-50,7
+51,7
@@
static ssize_t video_output_store_state(struct device *dev,
int request_state = simple_strtoul(buf,&endp,0);
size_t size = endp - buf;
int request_state = simple_strtoul(buf,&endp,0);
size_t size = endp - buf;
- if (
*endp &&
isspace(*endp))
+ if (isspace(*endp))
size++;
if (size != count)
return -EINVAL;
size++;
if (size != count)
return -EINVAL;
@@
-96,7
+97,7
@@
struct output_device *video_output_register(const char *name,
new_dev->props = op;
new_dev->dev.class = &video_output_class;
new_dev->dev.parent = dev;
new_dev->props = op;
new_dev->dev.class = &video_output_class;
new_dev->dev.parent = dev;
-
strlcpy(new_dev->dev.bus_id,name, BUS_ID_SIZE
);
+
dev_set_name(&new_dev->dev, name
);
dev_set_drvdata(&new_dev->dev, devdata);
ret_code = device_register(&new_dev->dev);
if (ret_code) {
dev_set_drvdata(&new_dev->dev, devdata);
ret_code = device_register(&new_dev->dev);
if (ret_code) {