diff options
Diffstat (limited to 'drivers/media/video/omap3isp/isp.h')
-rw-r--r-- | drivers/media/video/omap3isp/isp.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/omap3isp/isp.h b/drivers/media/video/omap3isp/isp.h index d96603eb0d17..f8d1f100fc19 100644 --- a/drivers/media/video/omap3isp/isp.h +++ b/drivers/media/video/omap3isp/isp.h | |||
@@ -145,6 +145,7 @@ struct isp_platform_callback { | |||
145 | * @raw_dmamask: Raw DMA mask | 145 | * @raw_dmamask: Raw DMA mask |
146 | * @stat_lock: Spinlock for handling statistics | 146 | * @stat_lock: Spinlock for handling statistics |
147 | * @isp_mutex: Mutex for serializing requests to ISP. | 147 | * @isp_mutex: Mutex for serializing requests to ISP. |
148 | * @crashed: Bitmask of crashed entities (indexed by entity ID) | ||
148 | * @has_context: Context has been saved at least once and can be restored. | 149 | * @has_context: Context has been saved at least once and can be restored. |
149 | * @ref_count: Reference count for handling multiple ISP requests. | 150 | * @ref_count: Reference count for handling multiple ISP requests. |
150 | * @cam_ick: Pointer to camera interface clock structure. | 151 | * @cam_ick: Pointer to camera interface clock structure. |
@@ -184,7 +185,7 @@ struct isp_device { | |||
184 | /* ISP Obj */ | 185 | /* ISP Obj */ |
185 | spinlock_t stat_lock; /* common lock for statistic drivers */ | 186 | spinlock_t stat_lock; /* common lock for statistic drivers */ |
186 | struct mutex isp_mutex; /* For handling ref_count field */ | 187 | struct mutex isp_mutex; /* For handling ref_count field */ |
187 | bool needs_reset; | 188 | u32 crashed; |
188 | int has_context; | 189 | int has_context; |
189 | int ref_count; | 190 | int ref_count; |
190 | unsigned int autoidle; | 191 | unsigned int autoidle; |