diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-12 20:29:17 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-12 20:29:17 -0400 |
| commit | 3c1f67d60e2b4f4455563928999fd41cc653645d (patch) | |
| tree | 0d58c145a05fb09167f1ab6882b474eccb1f3563 /drivers/dma/ipu/ipu_idmac.c | |
| parent | 03d78913f01e8f6599823f00357ed17b32747d3d (diff) | |
| parent | 9ead64974b05501bbac0d63a47c99fa786d064ba (diff) | |
Merge branch 'linus' into core/locking
Diffstat (limited to 'drivers/dma/ipu/ipu_idmac.c')
| -rw-r--r-- | drivers/dma/ipu/ipu_idmac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/ipu/ipu_idmac.c b/drivers/dma/ipu/ipu_idmac.c index 1f154d08e98f..ae50a9d1a4e6 100644 --- a/drivers/dma/ipu/ipu_idmac.c +++ b/drivers/dma/ipu/ipu_idmac.c | |||
| @@ -729,7 +729,7 @@ static int ipu_init_channel_buffer(struct idmac_channel *ichan, | |||
| 729 | 729 | ||
| 730 | ichan->status = IPU_CHANNEL_READY; | 730 | ichan->status = IPU_CHANNEL_READY; |
| 731 | 731 | ||
| 732 | spin_unlock_irqrestore(ipu->lock, flags); | 732 | spin_unlock_irqrestore(&ipu->lock, flags); |
| 733 | 733 | ||
| 734 | return 0; | 734 | return 0; |
| 735 | } | 735 | } |