diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-10-17 16:29:01 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-10-17 16:29:01 +0100 |
| commit | 50ad5f591bf0d2c877cb3689be01bea9eefdeb2b (patch) | |
| tree | b9979a6649f053fc824f75e4ad65ac22854fd4b4 /arch/arm/plat-omap/mcbsp.c | |
| parent | daaeb6c93829806221b2ac533330c64f338ebb89 (diff) | |
| parent | f6919eb41127db2e06342efcc2da1eeb4646ec34 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch/arm/plat-omap/mcbsp.c')
| -rw-r--r-- | arch/arm/plat-omap/mcbsp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c index 88ac9768f1c..e664b912d7b 100644 --- a/arch/arm/plat-omap/mcbsp.c +++ b/arch/arm/plat-omap/mcbsp.c @@ -595,7 +595,7 @@ void omap_mcbsp_stop(unsigned int id, int tx, int rx) rx &= 1; if (cpu_is_omap2430() || cpu_is_omap34xx()) { w = OMAP_MCBSP_READ(io_base, RCCR); - w |= (tx ? RDISABLE : 0); + w |= (rx ? RDISABLE : 0); OMAP_MCBSP_WRITE(io_base, RCCR, w); } w = OMAP_MCBSP_READ(io_base, SPCR1); |