tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

* '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

Linus Torvalds 5cbb0601 2d5bc23b

+3 -2
unified split
+1 -1
arch/sh/kernel/cpu/irq/imask.c
··· 68 } 69 70 static struct irq_chip imask_irq_chip = { 71 - .typename = "SR.IMASK", 72 .mask = mask_imask_irq, 73 .unmask = unmask_imask_irq, 74 .mask_ack = mask_imask_irq,
··· 68 } 69 70 static struct irq_chip imask_irq_chip = { 71 + .name = "SR.IMASK", 72 .mask = mask_imask_irq, 73 .unmask = unmask_imask_irq, 74 .mask_ack = mask_imask_irq,
+1 -1
arch/sh/kernel/cpu/irq/intc-sh5.c
··· 85 static void end_intc_irq(unsigned int irq); 86 87 static struct irq_chip intc_irq_type = { 88 - .typename = "INTC", 89 .startup = startup_intc_irq, 90 .shutdown = shutdown_intc_irq, 91 .enable = enable_intc_irq,
··· 85 static void end_intc_irq(unsigned int irq); 86 87 static struct irq_chip intc_irq_type = { 88 + .name = "INTC", 89 .startup = startup_intc_irq, 90 .shutdown = shutdown_intc_irq, 91 .enable = enable_intc_irq,
+1
drivers/uio/uio_pdrv_genirq.c
··· 178 return 0; 179 bad1: 180 kfree(priv); 181 bad0: 182 return ret; 183 }
··· 178 return 0; 179 bad1: 180 kfree(priv); 181 + pm_runtime_disable(&pdev->dev); 182 bad0: 183 return ret; 184 }