diff mbox

userspace firmware load fails with current linux-next

Message ID 20131023124333.356d0e15@ipc1.ka-ro
State New
Headers show

Commit Message

Lothar Waßmann Oct. 23, 2013, 10:43 a.m. UTC
Hi,

Ming Lei wrote:
> On Wed, 23 Oct 2013 11:06:18 +0200
> Lothar Waßmann <LW@KARO-electronics.de> wrote:
> 
[...]
> > Or is it an unintended side effect of some recent change?
> 
> Maybe yes, could you test below patch?
> 
> Tejun, looks we need to keep special attention on zero size of bin file
> as before, could you comment at the patch?
> 
> --
> diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
> index 5d818df..366ae8d 100644
> --- a/fs/sysfs/file.c
> +++ b/fs/sysfs/file.c
> @@ -277,7 +277,7 @@ static ssize_t sysfs_write_file(struct file *file, const char __user *user_buf,
>  	ssize_t len = min_t(size_t, count, PAGE_SIZE);
>  	char *buf;
>  
> -	if (sysfs_is_bin(of->sd)) {
> +	if (sysfs_is_bin(of->sd) && size) {
>  		loff_t size = file_inode(file)->i_size;
>  
>  		if (size <= *ppos)
> 
> 
> 
The patch as is produces a build error, because 'size' is only defined
after the 'if' statement.

The modified patch below works for me.




Lothar Waßmann

Comments

Ming Lei Oct. 23, 2013, 10:48 a.m. UTC | #1
On Wed, Oct 23, 2013 at 6:43 PM, Lothar Waßmann <LW@karo-electronics.de> wrote:

> The patch as is produces a build error, because 'size' is only defined
> after the 'if' statement.

Sorry for that, :-)

>
> The modified patch below works for me.
>
> diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
> index 5d818df..709d6f5 100644
> --- a/fs/sysfs/file.c
> +++ b/fs/sysfs/file.c
> @@ -277,7 +277,7 @@ static ssize_t sysfs_write_file(struct file *file, const char __user *user_buf,
>         ssize_t len = min_t(size_t, count, PAGE_SIZE);
>         char *buf;
>
> -       if (sysfs_is_bin(of->sd)) {
> +       if (sysfs_is_bin(of->sd) && file_inode(file)->i_size) {
>                 loff_t size = file_inode(file)->i_size;
>
>                 if (size <= *ppos)

OK, thanks for your test, and will prepare a formal one later.


Thanks,
--
Ming Lei
diff mbox

Patch

diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index 5d818df..709d6f5 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -277,7 +277,7 @@  static ssize_t sysfs_write_file(struct file *file, const char __user *user_buf,
 	ssize_t len = min_t(size_t, count, PAGE_SIZE);
 	char *buf;
 
-	if (sysfs_is_bin(of->sd)) {
+	if (sysfs_is_bin(of->sd) && file_inode(file)->i_size) {
 		loff_t size = file_inode(file)->i_size;
 
 		if (size <= *ppos)