diff mbox

drm: fix writing to /sys/class/drm/*/status

Message ID 20150605192400.GP7557@n2100.arm.linux.org.uk (mailing list archive)
State New, archived
Headers show

Commit Message

Russell King - ARM Linux June 5, 2015, 7:24 p.m. UTC 
On Fri, Jun 05, 2015 at 07:56:38PM +0100, Chris Wilson wrote:
> On Fri, Jun 05, 2015 at 07:47:22PM +0100, Russell King wrote:
> > Writing to a file is supposed to return the number of bytes written.
> > Returning zero unfortunately causes bash to constantly spin trying
> > to write to the sysfs file, to such an extent that even ^c and ^z
> > have no effect.  The only way out of that is to kill the shell and
> > log back in.  This isn't nice behaviour.
> > 
> > Fix it by returning the number of characters written to sysfs files.
> > 
> > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
> 
> Oops.
> 
> Fixes: c484f02d0f02fbbfc6decc945a69aae011041a27
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
> 
> Dave, we need this for 4.1...

Viro suggests an alternative, simpler fix:


Would you prefer this one?
diff mbox

Patch

diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
index ffc305fc2076..eb7e61078a5b 100644
--- a/drivers/gpu/drm/drm_sysfs.c
+++ b/drivers/gpu/drm/drm_sysfs.c
@@ -217,7 +217,7 @@  static ssize_t status_store(struct device *device,
 
 	mutex_unlock(&dev->mode_config.mutex);
 
-	return ret;
+	return ret ? ret : count;
 }
 
 static ssize_t status_show(struct device *device,