iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

Browse Source 
* 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: Fixup last users of irq_chip->typename
  uio: pm_runtime_disable is needed if failed
This commit is contained in:
Linus Torvalds 2009-11-18 07:38:19 -08:00
commit 5cbb0601bf
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sh/kernel/cpu/irq/imask.c
View File

@ -68,7 +68,7 @@ static void unmask_imask_irq(unsigned int irq)
} }
static struct irq_chip imask_irq_chip = { static struct irq_chip imask_irq_chip = {
.typename = "SR.IMASK", .name = "SR.IMASK",
.mask = mask_imask_irq, .mask = mask_imask_irq,
.unmask = unmask_imask_irq, .unmask = unmask_imask_irq,
.mask_ack = mask_imask_irq, .mask_ack = mask_imask_irq,

2
arch/sh/kernel/cpu/irq/intc-sh5.c
View File

@ -85,7 +85,7 @@ static void mask_and_ack_intc(unsigned int);
static void end_intc_irq(unsigned int irq); static void end_intc_irq(unsigned int irq);
static struct irq_chip intc_irq_type = { static struct irq_chip intc_irq_type = {
.typename = "INTC", .name = "INTC",
.startup = startup_intc_irq, .startup = startup_intc_irq,
.shutdown = shutdown_intc_irq, .shutdown = shutdown_intc_irq,
.enable = enable_intc_irq, .enable = enable_intc_irq,

1
drivers/uio/uio_pdrv_genirq.c
View File

@ -178,6 +178,7 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev)
return 0; return 0;
bad1: bad1:
kfree(priv); kfree(priv);
pm_runtime_disable(&pdev->dev);
bad0: bad0:
return ret; return ret;
} }