openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Mahati Chamarthy 2014-09-30 20:36:06 +05:30 committed by Greg Kroah-Hartman
parent 89f904388d
commit 50b47bbd43
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/media/omap24xx/omap24xxcam-dma.c
View File

@ -475,15 +475,13 @@ void omap24xxcam_sgdma_process(struct omap24xxcam_sgdma *sgdma)
spin_unlock_irqrestore(&sgdma->lock, flags); spin_unlock_irqrestore(&sgdma->lock, flags);
return; return;
} }
unsigned long expires;
/* DMA start was successful */ /* DMA start was successful */
sg_state->next_sglist++; sg_state->next_sglist++;
sg_state->bytes_read += len; sg_state->bytes_read += len;
sg_state->queued_sglist++; sg_state->queued_sglist++;
/* We start the reset timer */ /* We start the reset timer */
expires = jiffies + HZ; mod_timer(&sgdma->reset_timer, jiffies + HZ);
mod_timer(&sgdma->reset_timer, expires);
} }
queued_sgdma--; queued_sgdma--;
sgslot = (sgslot + 1) % NUM_SG_DMA; sgslot = (sgslot + 1) % NUM_SG_DMA;