The patch titled
sound-fix-hang-in-mpu401_uartc-tidy
has been removed from the -mm tree. Its filename is
sound-fix-hang-in-mpu401_uartc-tidy.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: Andrew Morton <akpm@xxxxxxxx>
Cc: Jon Masters <jcm@xxxxxxxxxxxxxx>
Cc: Jaroslav Kysela <perex@xxxxxxx>
Cc: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
sound/drivers/mpu401/mpu401_uart.c | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff -puN sound/drivers/mpu401/mpu401_uart.c~sound-fix-hang-in-mpu401_uartc-tidy sound/drivers/mpu401/mpu401_uart.c
--- devel/sound/drivers/mpu401/mpu401_uart.c~sound-fix-hang-in-mpu401_uartc-tidy 2006-04-16 18:18:19.000000000 -0700
+++ devel-akpm/sound/drivers/mpu401/mpu401_uart.c 2006-04-16 18:18:19.000000000 -0700
@@ -183,7 +183,8 @@ static void snd_mpu401_uart_remove_timer
*/
-static int snd_mpu401_uart_cmd(struct snd_mpu401 * mpu, unsigned char cmd, int ack)
+static int snd_mpu401_uart_cmd(struct snd_mpu401 *mpu, unsigned char cmd,
+ int ack)
{
unsigned long flags;
int timeout, ok;
@@ -218,12 +219,14 @@ static int snd_mpu401_uart_cmd(struct sn
ok = 1;
}
spin_unlock_irqrestore(&mpu->input_lock, flags);
- if (ok)
- return 0;
- else {
- snd_printk("cmd: 0x%x failed at 0x%lx (status = 0x%x, data = 0x%x)\n", cmd, mpu->port, mpu->read(mpu, MPU401C(mpu)), mpu->read(mpu, MPU401D(mpu)));
+ if (!ok) {
+ snd_printk("cmd: 0x%x failed at 0x%lx (status = 0x%x, data = "
+ "0x%x)\n",
+ cmd, mpu->port, mpu->read(mpu, MPU401C(mpu)),
+ mpu->read(mpu, MPU401D(mpu)));
return 1;
}
+ return 0;
}
/*
@@ -238,12 +241,10 @@ static int snd_mpu401_uart_input_open(st
if (mpu->open_input && (err = mpu->open_input(mpu)) < 0)
return err;
if (! test_bit(MPU401_MODE_BIT_OUTPUT, &mpu->mode)) {
- if ((err = snd_mpu401_uart_cmd(mpu, MPU401_RESET, 1))) {
+ if (snd_mpu401_uart_cmd(mpu, MPU401_RESET, 1))
return -EFAULT;
- }
- if ((err = snd_mpu401_uart_cmd(mpu, MPU401_ENTER_UART, 1))) {
+ if (snd_mpu401_uart_cmd(mpu, MPU401_ENTER_UART, 1))
return -EFAULT;
- }
}
mpu->substream_input = substream;
set_bit(MPU401_MODE_BIT_INPUT, &mpu->mode);
@@ -258,10 +259,10 @@ static int snd_mpu401_uart_output_open(s
mpu = substream->rmidi->private_data;
if (mpu->open_output && (err = mpu->open_output(mpu)) < 0)
return err;
- if (! test_bit(MPU401_MODE_BIT_INPUT, &mpu->mode)) {
- if ((err = snd_mpu401_uart_cmd(mpu, MPU401_RESET, 1)))
+ if (!test_bit(MPU401_MODE_BIT_INPUT, &mpu->mode)) {
+ if (snd_mpu401_uart_cmd(mpu, MPU401_RESET, 1))
return -EFAULT;
- if ((err = snd_mpu401_uart_cmd(mpu, MPU401_ENTER_UART, 1)))
+ if (snd_mpu401_uart_cmd(mpu, MPU401_ENTER_UART, 1))
return -EFAULT;
}
mpu->substream_output = substream;
@@ -331,7 +332,6 @@ static void snd_mpu401_uart_input_trigge
snd_mpu401_uart_remove_timer(mpu, 1);
clear_bit(MPU401_MODE_BIT_INPUT_TRIGGER, &mpu->mode);
}
-
}
/*
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
sound-fix-hang-in-mpu401_uartc.patch
sound-fix-hang-in-mpu401_uartc-tidy.patch
powernow-k8-crash-workaround.patch
git-dvb.patch
sparc32-vivi-fix.patch
git-dvb-compat-build-fix.patch
bt866-build-fix.patch
connector-exports.patch
i2c-add-support-for-virtual-i2c-adapters-tidy.patch
i2c-add-support-for-virtual-i2c-adapters-fix.patch
git-libata-all.patch
mtd-improve-parameter-parsing-for-block2mtd-fix.patch
pci-error-recovery-e1000-network-device-driver.patch
gregkh-pci-pci-64-bit-resources-drivers-others-changes-amba-fix.patch
improve-pci-config-space-writeback-tidy.patch
git-pcmcia.patch
revert-pci-pci-cardbus-cards-hidden-needs-pci=assign-busses-to-fix.patch
git-scsi-misc.patch
git-scsi-misc-scsi_kmap_atomic_sg-warning-fix.patch
megaraid-unused-variable.patch
git-splice-fixup.patch
git-watchdog.patch
x86_64-mm-alternatives-fix.patch
arm-add_memory-build-fix.patch
pg_uncached-is-ia64-only.patch
migration-remove-unnecessary-pageswapcache-checks-fix.patch
wait_table-and-zonelist-initializing-for-memory-hotadd-wait_table-initialization-fixes.patch
preserve-write-permissions-in-migration-entries-fix.patch
oom-kill-mm-locking-fix.patch
page_allocc-buddy-handling-cleanup.patch
slab-cleanup-kmem_getpages-fix.patch
slab-stop-using-list_for_each-fix.patch
acx1xx-wireless-driver.patch
prune_one_dentry-tweaks.patch
fix-cdrom-being-confused-on-using-kdump-tweaks.patch
mmput-might-sleep.patch
tpm-use-clear_bit-fix.patch
tpm-use-clear_bit-fix-fix.patch
tpm-use-clear_bit-fix-fix-fix-fix.patch
hangcheck-remove-monotomic_clock-on-x86.patch
pi-futex-futex-code-cleanups-fix.patch
reiser4.patch
kgdb-core-lite-add-reboot-command.patch
kgdb-8250-fix.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
revert-tty-buffering-comment-out-debug-code.patch
slab-leaks3-default-y.patch
x86-kmap_atomic-debugging.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
