From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Sun, 14 Feb 2016 00:33:05 +0000 (+0200)
Subject: greybus: camera: Clean up when AP link power mode configuration failed
X-Git-Tag: v4.9-rc1~119^2~378^2~21^2~681
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b573b0e65616c1ae5c5dd2c14fd62d3ded3d5466;p=karo-tx-linux.git

greybus: camera: Clean up when AP link power mode configuration failed

Restore the module link power mode to the previous state in that case.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Gjorgji Rosikopulos <grosikopulos@mm-sol.com>
Tested-by: Jacopo Mondi <jacopo.mondi@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
---

diff --git a/drivers/staging/greybus/camera.c b/drivers/staging/greybus/camera.c
index 8383770910c5..25dbf690e1fc 100644
--- a/drivers/staging/greybus/camera.c
+++ b/drivers/staging/greybus/camera.c
@@ -147,6 +147,7 @@ static int gb_camera_set_power_mode(struct gb_camera *gcam, bool hs)
 
 	ret = gb_camera_set_intf_power_mode(gcam, svc->ap_intf_id, hs);
 	if (ret < 0) {
+		gb_camera_set_intf_power_mode(gcam, intf->interface_id, !hs);
 		gcam_err(gcam, "failed to set AP interface to %s (%d)\n",
 			 hs ? "HS" : "PWM", ret);
 		return ret;