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

Commit 3c729087 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'omap-fixes-for-linus' of... 

Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
  omap: McBSP: tx_irq_completion used in rx_irq_handler
  omap: Fix compile dependency to LEDS_CLASS
parents 9d8117e7 cb922d25

arch/arm/plat-omap/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ config OMAP_DEBUG_DEVICES 
config OMAP_DEBUG_LEDS

	bool

	depends on OMAP_DEBUG_DEVICES

	default y if LEDS

	default y if LEDS_CLASS



config OMAP_RESET_CLOCKS

	bool "Reset unused clocks during boot"

arch/arm/plat-omap/mcbsp.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static irqreturn_t omap_mcbsp_rx_irq_handler(int irq, void *dev_id) 
		/* Writing zero to RSYNC_ERR clears the IRQ */

		MCBSP_WRITE(mcbsp_rx, SPCR1, MCBSP_READ_CACHE(mcbsp_rx, SPCR1));

	} else {

		complete(&mcbsp_rx->tx_irq_completion);

		complete(&mcbsp_rx->rx_irq_completion);

	}



	return IRQ_HANDLED;