diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-23 10:47:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-23 10:47:01 -0700 |
| commit | a800faec1b21d7133b5f0c8c6dac593b7c4e118d (patch) | |
| tree | e190372af6ee0a2a64e9ae70690b18b48d66be00 /arch/cris/arch-v10/kernel/dma.c | |
| parent | c488eef8154b36cce905624577183dc1fa8f6da0 (diff) | |
| parent | 7b994836f09fc3ce7d073ad6f8259a1a84003e02 (diff) | |
| download | linux-stable-a800faec1b21d7133b5f0c8c6dac593b7c4e118d.tar.gz linux-stable-a800faec1b21d7133b5f0c8c6dac593b7c4e118d.tar.bz2 linux-stable-a800faec1b21d7133b5f0c8c6dac593b7c4e118d.zip | |
Merge branch 'for-linus' of git://www.jni.nu/cris
* 'for-linus' of git://www.jni.nu/cris:
CRISv10: remove redundant tests on unsigned
CRISv32: irq.c - Move end brace outside #endif
CRISv32: Fix potential null reference in cryptocop driver.
CRISv32: Add arch optimized strcmp.
CRIS: assignment/is equal confusion
Diffstat (limited to 'arch/cris/arch-v10/kernel/dma.c')
| -rw-r--r-- | arch/cris/arch-v10/kernel/dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v10/kernel/dma.c b/arch/cris/arch-v10/kernel/dma.c index 929e68666299..d31504b4a19e 100644 --- a/arch/cris/arch-v10/kernel/dma.c +++ b/arch/cris/arch-v10/kernel/dma.c @@ -24,7 +24,7 @@ int cris_request_dma(unsigned int dmanr, const char * device_id, unsigned long int gens; int fail = -EINVAL; - if ((dmanr < 0) || (dmanr >= MAX_DMA_CHANNELS)) { + if (dmanr >= MAX_DMA_CHANNELS) { printk(KERN_CRIT "cris_request_dma: invalid DMA channel %u\n", dmanr); return -EINVAL; } @@ -213,7 +213,7 @@ int cris_request_dma(unsigned int dmanr, const char * device_id, void cris_free_dma(unsigned int dmanr, const char * device_id) { unsigned long flags; - if ((dmanr < 0) || (dmanr >= MAX_DMA_CHANNELS)) { + if (dmanr >= MAX_DMA_CHANNELS) { printk(KERN_CRIT "cris_free_dma: invalid DMA channel %u\n", dmanr); return; } |