summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorMatt Ranostay <matt.ranostay@konsulko.com>2018-11-25 01:03:23 +0300
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-12-07 16:33:23 +0300
commitac11da47ff45f1f6f19c87cde6f36d9b17d42989 (patch)
tree297c6170f79d5e96d191eaf02abcfe85c8d69413 /drivers/media
parent69d2a734c5dc7085365e752a7e8e35999c7a6c20 (diff)
downloadlinux-ac11da47ff45f1f6f19c87cde6f36d9b17d42989.tar.xz
media: video-i2c: check if chip struct has set_power function
Not all future supported video chips will always have power management support, and so it is important to check before calling set_power() is defined. Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com> Reviewed-by: Akinobu Mita <akinobu.mita@gmail.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/i2c/video-i2c.c22
1 files changed, 17 insertions, 5 deletions
diff --git a/drivers/media/i2c/video-i2c.c b/drivers/media/i2c/video-i2c.c
index b6ebb8d53e90..01dcf179f203 100644
--- a/drivers/media/i2c/video-i2c.c
+++ b/drivers/media/i2c/video-i2c.c
@@ -736,9 +736,11 @@ static int video_i2c_probe(struct i2c_client *client,
video_set_drvdata(&data->vdev, data);
i2c_set_clientdata(client, data);
- ret = data->chip->set_power(data, true);
- if (ret)
- goto error_unregister_device;
+ if (data->chip->set_power) {
+ ret = data->chip->set_power(data, true);
+ if (ret)
+ goto error_unregister_device;
+ }
pm_runtime_get_noresume(&client->dev);
pm_runtime_set_active(&client->dev);
@@ -767,7 +769,9 @@ error_pm_disable:
pm_runtime_disable(&client->dev);
pm_runtime_set_suspended(&client->dev);
pm_runtime_put_noidle(&client->dev);
- data->chip->set_power(data, false);
+
+ if (data->chip->set_power)
+ data->chip->set_power(data, false);
error_unregister_device:
v4l2_device_unregister(v4l2_dev);
@@ -791,7 +795,9 @@ static int video_i2c_remove(struct i2c_client *client)
pm_runtime_disable(&client->dev);
pm_runtime_set_suspended(&client->dev);
pm_runtime_put_noidle(&client->dev);
- data->chip->set_power(data, false);
+
+ if (data->chip->set_power)
+ data->chip->set_power(data, false);
video_unregister_device(&data->vdev);
@@ -804,6 +810,9 @@ static int video_i2c_pm_runtime_suspend(struct device *dev)
{
struct video_i2c_data *data = i2c_get_clientdata(to_i2c_client(dev));
+ if (!data->chip->set_power)
+ return 0;
+
return data->chip->set_power(data, false);
}
@@ -811,6 +820,9 @@ static int video_i2c_pm_runtime_resume(struct device *dev)
{
struct video_i2c_data *data = i2c_get_clientdata(to_i2c_client(dev));
+ if (!data->chip->set_power)
+ return 0;
+
return data->chip->set_power(data, true);
}