Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50b47bbd authored by Mahati Chamarthy's avatar Mahati Chamarthy Committed by Greg Kroah-Hartman
Browse files

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: default avatarMahati Chamarthy <mahati.chamarthy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 89f90438

drivers/staging/media/omap24xx/omap24xxcam-dma.c

+1 −3
Original line number Diff line number Diff line
@@ -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;