summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRui Miguel Silva <rui.silva@linaro.org>2016-02-17 14:32:52 +0000
committerGreg Kroah-Hartman <gregkh@google.com>2016-02-17 15:24:09 -0800
commit137f717942c9cff82484ee90647881d9c524178f (patch)
tree35a7563542870a74be929f813884e31238cdf3b5 /drivers
parent492331435465977407e43865c19e34918cd90a66 (diff)
greybus: lights: remove has_flash on failure
If register to v4l2 fails just mark the light as not having flash so in release we do not try to unregister. Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/greybus/light.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/staging/greybus/light.c b/drivers/staging/greybus/light.c
index 6c5b9994457c..4c46d149cb7d 100644
--- a/drivers/staging/greybus/light.c
+++ b/drivers/staging/greybus/light.c
@@ -1004,8 +1004,10 @@ static int gb_lights_light_register(struct gb_light *light)
if (light->has_flash) {
ret = gb_lights_light_v4l2_register(light);
- if (ret < 0)
+ if (ret < 0) {
+ light->has_flash = false;
return ret;
+ }
}
return 0;