From 07771298354664e50d3fdf464a8259d8f0e8e66f Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Wed, 11 May 2011 10:49:58 +0200 Subject: [PATCH] --- yaml --- r: 248173 b: refs/heads/master c: 8839eedafd2e91e5b124730825e9b39b1ff493dd h: refs/heads/master i: 248171: 0e4a4282d61d554ce43c9e4f454fe60b56ad182b v: v3 --- [refs] | 2 +- trunk/sound/firewire/isight.c | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 50c295393bf7..9d80024057a7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2934cd499ba2c7f605787508b4cfcfa3a45b0a4 +refs/heads/master: 8839eedafd2e91e5b124730825e9b39b1ff493dd diff --git a/trunk/sound/firewire/isight.c b/trunk/sound/firewire/isight.c index 10a9b9b0b2c2..1a8da2614db6 100644 --- a/trunk/sound/firewire/isight.c +++ b/trunk/sound/firewire/isight.c @@ -345,7 +345,7 @@ static int isight_hw_free(struct snd_pcm_substream *substream) static int isight_start_streaming(struct isight *isight) { - __be32 sample_rate; + __be32 value; unsigned int i; int err; @@ -356,10 +356,10 @@ static int isight_start_streaming(struct isight *isight) return 0; } - sample_rate = cpu_to_be32(RATE_48000); + value = cpu_to_be32(RATE_48000); err = snd_fw_transaction(isight->unit, TCODE_WRITE_QUADLET_REQUEST, isight->audio_base + REG_SAMPLE_RATE, - &sample_rate, 4); + &value, 4); if (err < 0) return err; @@ -367,6 +367,13 @@ static int isight_start_streaming(struct isight *isight) if (err < 0) goto error; + value = cpu_to_be32(AUDIO_ENABLE); + err = snd_fw_transaction(isight->unit, TCODE_WRITE_QUADLET_REQUEST, + isight->audio_base + REG_AUDIO_ENABLE, + &value, 4); + if (err < 0) + goto err_resources; + isight->context = fw_iso_context_create(isight->device->card, FW_ISO_CONTEXT_RECEIVE, isight->resources.channel, @@ -400,6 +407,10 @@ static int isight_start_streaming(struct isight *isight) fw_iso_context_destroy(isight->context); isight->context = NULL; err_resources: + value = 0; + snd_fw_transaction(isight->unit, TCODE_WRITE_QUADLET_REQUEST, + isight->audio_base + REG_AUDIO_ENABLE, + &value, 4); fw_iso_resources_free(&isight->resources); error: return err;