diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-01 10:06:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-01 10:06:09 -0800 |
| commit | 8098a7ef8946169cf8ffeb6f4d8130fc3651192e (patch) | |
| tree | 90d2da5a7340a1cbaf5f779986d733a900b88f15 /arch/cris/arch-v32/kernel | |
| parent | 4805a1b0e6d74feb6428c05116a2886a076ee341 (diff) | |
| parent | d8fe989e7368a26e4baf9acb55524c71e5c3a117 (diff) | |
Merge branch 'for-linus' of git://repo.or.cz/cris-mirror
* 'for-linus' of git://repo.or.cz/cris-mirror:
cris: Fixup last users of irq_chip->typename
CRIS v32: Should index be positive?
Diffstat (limited to 'arch/cris/arch-v32/kernel')
| -rw-r--r-- | arch/cris/arch-v32/kernel/irq.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/kernel/pinmux.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/cris/arch-v32/kernel/irq.c b/arch/cris/arch-v32/kernel/irq.c index 57668db2503..b6241198fb9 100644 --- a/arch/cris/arch-v32/kernel/irq.c +++ b/arch/cris/arch-v32/kernel/irq.c @@ -336,7 +336,7 @@ int set_affinity_crisv32_irq(unsigned int irq, const struct cpumask *dest) } static struct irq_chip crisv32_irq_type = { - .typename = "CRISv32", + .name = "CRISv32", .startup = startup_crisv32_irq, .shutdown = shutdown_crisv32_irq, .enable = enable_crisv32_irq, diff --git a/arch/cris/arch-v32/kernel/pinmux.c b/arch/cris/arch-v32/kernel/pinmux.c index 6eb54ea1c97..f6f3637a419 100644 --- a/arch/cris/arch-v32/kernel/pinmux.c +++ b/arch/cris/arch-v32/kernel/pinmux.c @@ -54,7 +54,7 @@ crisv32_pinmux_alloc(int port, int first_pin, int last_pin, enum pin_mode mode) crisv32_pinmux_init(); - if (port > PORTS) + if (port > PORTS || port < 0) return -EINVAL; spin_lock_irqsave(&pinmux_lock, flags); @@ -197,7 +197,7 @@ crisv32_pinmux_dealloc(int port, int first_pin, int last_pin) crisv32_pinmux_init(); - if (port > PORTS) + if (port > PORTS || port < 0) return -EINVAL; spin_lock_irqsave(&pinmux_lock, flags); |