summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/media/platform/soc_camera/soc_camera.c19
-rw-r--r--include/media/soc_camera.h2
2 files changed, 19 insertions, 2 deletions
diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c
index 1e83100..3cc0860 100644
--- a/drivers/media/platform/soc_camera/soc_camera.c
+++ b/drivers/media/platform/soc_camera/soc_camera.c
@@ -512,10 +512,23 @@ static int soc_camera_add_device(struct soc_camera_device *icd)
if (ici->icd)
return -EBUSY;
+ if (ici->ops->clock_start) {
+ ret = ici->ops->clock_start(ici);
+ if (ret < 0)
+ return ret;
+ }
+
ret = ici->ops->add(icd);
- if (!ret)
- ici->icd = icd;
+ if (ret < 0)
+ goto eadd;
+
+ ici->icd = icd;
+ return 0;
+
+eadd:
+ if (ici->ops->clock_stop)
+ ici->ops->clock_stop(ici);
return ret;
}
@@ -527,6 +540,8 @@ static void soc_camera_remove_device(struct soc_camera_device *icd)
return;
ici->ops->remove(icd);
+ if (ici->ops->clock_stop)
+ ici->ops->clock_stop(ici);
ici->icd = NULL;
}
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index db23a8f..dfa24df 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -74,6 +74,8 @@ struct soc_camera_host_ops {
struct module *owner;
int (*add)(struct soc_camera_device *);
void (*remove)(struct soc_camera_device *);
+ int (*clock_start)(struct soc_camera_host *);
+ void (*clock_stop)(struct soc_camera_host *);
/*
* .get_formats() is called for each client device format, but
* .put_formats() is only called once. Further, if any of the calls to