diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2011-09-04 22:17:38 +0200 |
|---|---|---|
| committer | Clemens Ladisch <clemens@ladisch.de> | 2013-10-20 22:07:57 +0200 |
| commit | 1b70485f135a39d5f2d8c392a16817456fa3a5cd (patch) | |
| tree | cf1b9b833619374c3169c368890652d53594b43d /sound/firewire/speakers.c | |
| parent | a644a9473f7f9519e2fe519136959dd0e671572a (diff) | |
| download | linux-1b70485f135a39d5f2d8c392a16817456fa3a5cd.tar.bz2 | |
ALSA: firewire: extend snd_fw_transaction()
Add a flag to snd_fw_transaction() to allow it to abort when a bus reset
happens. This removes most of the duplicated error handling loops that
were required around calls to the low-level fw_run_transaction().
Also add a flag to suppress error messages; errors are expected when we
attempt to clean up after the device was unplugged.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'sound/firewire/speakers.c')
| -rw-r--r-- | sound/firewire/speakers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/firewire/speakers.c b/sound/firewire/speakers.c index 6a68caf1d04f..eb3f7dce1d6c 100644 --- a/sound/firewire/speakers.c +++ b/sound/firewire/speakers.c @@ -647,7 +647,7 @@ static u32 fwspk_read_firmware_version(struct fw_unit *unit) int err; err = snd_fw_transaction(unit, TCODE_READ_QUADLET_REQUEST, - OXFORD_FIRMWARE_ID_ADDRESS, &data, 4); + OXFORD_FIRMWARE_ID_ADDRESS, &data, 4, 0); return err >= 0 ? be32_to_cpu(data) : 0; } |