projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[cascardo/linux.git]
/
drivers
/
w1
/
w1.c
diff --git
a/drivers/w1/w1.c
b/drivers/w1/w1.c
index
ad5897d
..
2839e28
100644
(file)
--- a/
drivers/w1/w1.c
+++ b/
drivers/w1/w1.c
@@
-120,7
+120,7
@@
static struct device_attribute w1_slave_attr_id =
/* Default family */
/* Default family */
-static ssize_t w1_default_write(struct kobject *kobj,
+static ssize_t w1_default_write(struct
file *filp, struct
kobject *kobj,
struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t count)
{
struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t count)
{
@@
-139,7
+139,7
@@
out_up:
return count;
}
return count;
}
-static ssize_t w1_default_read(struct kobject *kobj,
+static ssize_t w1_default_read(struct
file *filp, struct
kobject *kobj,
struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t count)
{
struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t count)
{