diff options
Diffstat (limited to 'drivers/media/platform/omap3isp/isp.c')
-rw-r--r-- | drivers/media/platform/omap3isp/isp.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c index 5807185262fe..06a0df434249 100644 --- a/drivers/media/platform/omap3isp/isp.c +++ b/drivers/media/platform/omap3isp/isp.c | |||
@@ -391,7 +391,7 @@ static void isp_disable_interrupts(struct isp_device *isp) | |||
391 | * @isp: OMAP3 ISP device | 391 | * @isp: OMAP3 ISP device |
392 | * @idle: Consider idle state. | 392 | * @idle: Consider idle state. |
393 | * | 393 | * |
394 | * Set the power settings for the ISP and SBL bus and cConfigure the HS/VS | 394 | * Set the power settings for the ISP and SBL bus and configure the HS/VS |
395 | * interrupt source. | 395 | * interrupt source. |
396 | * | 396 | * |
397 | * We need to configure the HS/VS interrupt source before interrupts get | 397 | * We need to configure the HS/VS interrupt source before interrupts get |
@@ -588,9 +588,6 @@ static void isp_isr_sbl(struct isp_device *isp) | |||
588 | * @_isp: Pointer to the OMAP3 ISP device | 588 | * @_isp: Pointer to the OMAP3 ISP device |
589 | * | 589 | * |
590 | * Handles the corresponding callback if plugged in. | 590 | * Handles the corresponding callback if plugged in. |
591 | * | ||
592 | * Returns IRQ_HANDLED when IRQ was correctly handled, or IRQ_NONE when the | ||
593 | * IRQ wasn't handled. | ||
594 | */ | 591 | */ |
595 | static irqreturn_t isp_isr(int irq, void *_isp) | 592 | static irqreturn_t isp_isr(int irq, void *_isp) |
596 | { | 593 | { |
@@ -1420,7 +1417,7 @@ int omap3isp_module_sync_idle(struct media_entity *me, wait_queue_head_t *wait, | |||
1420 | } | 1417 | } |
1421 | 1418 | ||
1422 | /* | 1419 | /* |
1423 | * omap3isp_module_sync_is_stopped - Helper to verify if module was stopping | 1420 | * omap3isp_module_sync_is_stopping - Helper to verify if module was stopping |
1424 | * @wait: ISP submodule's wait queue for streamoff/interrupt synchronization | 1421 | * @wait: ISP submodule's wait queue for streamoff/interrupt synchronization |
1425 | * @stopping: flag which tells module wants to stop | 1422 | * @stopping: flag which tells module wants to stop |
1426 | * | 1423 | * |