Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cbb0601 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2d5bc23b 648f1534

arch/sh/kernel/cpu/irq/imask.c

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static void unmask_imask_irq(unsigned int irq) 
}



static struct irq_chip imask_irq_chip = {

	.typename	= "SR.IMASK",

	.name		= "SR.IMASK",

	.mask		= mask_imask_irq,

	.unmask		= unmask_imask_irq,

	.mask_ack	= mask_imask_irq,

arch/sh/kernel/cpu/irq/intc-sh5.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static void mask_and_ack_intc(unsigned int); 
static void end_intc_irq(unsigned int irq);



static struct irq_chip intc_irq_type = {

	.typename = "INTC",

	.name = "INTC",

	.startup = startup_intc_irq,

	.shutdown = shutdown_intc_irq,

	.enable = enable_intc_irq,

drivers/uio/uio_pdrv_genirq.c

+1 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev) 
	return 0;

 bad1:

	kfree(priv);

	pm_runtime_disable(&pdev->dev);

 bad0:

	return ret;

}