upstream: [media] rc-main: store_filter: pass errors to userland
authorJames Hogan <james.hogan@imgtec.com>
Mon, 10 Feb 2014 21:31:56 +0000 (18:31 -0300)
committerChanho Park <chanho61.park@samsung.com>
Thu, 7 Aug 2014 05:26:35 +0000 (14:26 +0900)
Propagate errors returned by drivers from the s_filter callback back to
userland when updating scancode filters. This allows userland to see
when the filter couldn't be updated, usually because it's not a valid
filter for the hardware.

Previously the filter was being updated conditionally on success of
s_filter, but the write always reported success back to userland.

Reported-by: Antti Seppälä <a.seppala@gmail.com>
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/rc/rc-main.c

index 4f7657a..5e5a3cb 100644 (file)
@@ -1086,7 +1086,7 @@ static ssize_t store_filter(struct device *device,
 
 unlock:
        mutex_unlock(&dev->lock);
-       return count;
+       return (ret < 0) ? ret : count;
 }
 
 static void rc_dev_release(struct device *device)