2 files changed, 31 insertions, 0 deletions

diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index b6be5ee678b6..66ebe5956a87 100644
--- a/drivers/media/video/soc_camera.c
+++ b/drivers/media/video/soc_camera.c
@@ -732,10 +732,36 @@ static int soc_camera_remove(struct device *dev)
         return 0;
 }
 
+static int soc_camera_suspend(struct device *dev, pm_message_t state)
+{
+        struct soc_camera_device *icd = to_soc_camera_dev(dev);
+        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
+        int ret = 0;
+
+        if (ici->ops->suspend)
+                ret = ici->ops->suspend(icd, state);
+
+        return ret;
+}
+
+static int soc_camera_resume(struct device *dev)
+{
+        struct soc_camera_device *icd = to_soc_camera_dev(dev);
+        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
+        int ret = 0;
+
+        if (ici->ops->resume)
+                ret = ici->ops->resume(icd);
+
+        return ret;
+}
+
 static struct bus_type soc_camera_bus_type = {
         .name           = "soc-camera",
         .probe          = soc_camera_probe,
         .remove         = soc_camera_remove,
+        .suspend        = soc_camera_suspend,
+        .resume         = soc_camera_resume,
 };
 
 static struct device_driver ic_drv = {
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index 1de98f150e99..d548de326722 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -14,6 +14,7 @@
 
 #include <linux/videodev2.h>
 #include <media/videobuf-core.h>
+#include <linux/pm.h>
 
 struct soc_camera_device {
         struct list_head list;
@@ -63,6 +64,8 @@ struct soc_camera_host_ops {
         struct module *owner;
         int (*add)(struct soc_camera_device *);
         void (*remove)(struct soc_camera_device *);
+        int (*suspend)(struct soc_camera_device *, pm_message_t state);
+        int (*resume)(struct soc_camera_device *);
         int (*set_fmt_cap)(struct soc_camera_device *, __u32,
                            struct v4l2_rect *);
         int (*try_fmt_cap)(struct soc_camera_device *, struct v4l2_format *);
@@ -111,6 +114,8 @@ struct soc_camera_ops {
         struct module *owner;
         int (*probe)(struct soc_camera_device *);
         void (*remove)(struct soc_camera_device *);
+        int (*suspend)(struct soc_camera_device *, pm_message_t state);
+        int (*resume)(struct soc_camera_device *);
         int (*init)(struct soc_camera_device *);
         int (*release)(struct soc_camera_device *);
         int (*start_capture)(struct soc_camera_device *);