diff options
| author |   Mahati Chamarthy <mahati.chamarthy@gmail.com> | 2014-09-30 20:36:06 +0530 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-02 09:33:46 -0700 |
| commit | 50b47bbd43510d754e86f0f590488d67f39f4374 (patch) | |
| tree | 0f3609bcea10681f33aab1119f9133b31f960cae /drivers/staging | |
| parent | Revert "staging: media: cxd2099: use usleep_range()" (diff) | |
| download | linux-dev-50b47bbd43510d754e86f0f590488d67f39f4374.tar.xz linux-dev-50b47bbd43510d754e86f0f590488d67f39f4374.zip | |
Staging: media: omap24xx: Merge two lines and remove unused variable
This patch merges two lines and removes a variable that becomes unused
after merging.
Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/media/omap24xx/omap24xxcam-dma.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/staging/media/omap24xx/omap24xxcam-dma.c b/drivers/staging/media/omap24xx/omap24xxcam-dma.c index fa0c15637db1..c427eb94ea66 100644 --- a/drivers/staging/media/omap24xx/omap24xxcam-dma.c +++ b/drivers/staging/media/omap24xx/omap24xxcam-dma.c @@ -475,15 +475,13 @@ void omap24xxcam_sgdma_process(struct omap24xxcam_sgdma *sgdma) spin_unlock_irqrestore(&sgdma->lock, flags); return; } - unsigned long expires; /* DMA start was successful */ sg_state->next_sglist++; sg_state->bytes_read += len; sg_state->queued_sglist++; /* We start the reset timer */ - expires = jiffies + HZ; - mod_timer(&sgdma->reset_timer, expires); + mod_timer(&sgdma->reset_timer, jiffies + HZ); } queued_sgdma--; sgslot = (sgslot + 1) % NUM_SG_DMA; |