From mboxrd@z Thu Jan 1 00:00:00 1970 From: Takashi Iwai Subject: Re: [PATCH 1/2] Revert "ALSA: fireworks: add support for AudioFire2 quirk" Date: Wed, 05 Aug 2015 07:54:50 +0200 Message-ID: References: <1438734065-5204-1-git-send-email-o-takashi@sakamocchi.jp> <1438734065-5204-2-git-send-email-o-takashi@sakamocchi.jp> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id 196B7265A2B for ; Wed, 5 Aug 2015 07:54:52 +0200 (CEST) In-Reply-To: <1438734065-5204-2-git-send-email-o-takashi@sakamocchi.jp> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Takashi Sakamoto Cc: johannes.oertel@uni-due.de, alsa-devel@alsa-project.org, clemens@ladisch.de, harryhaaren@gmail.com, ffado-devel@lists.sf.net List-Id: alsa-devel@alsa-project.org On Wed, 05 Aug 2015 02:21:04 +0200, Takashi Sakamoto wrote: > > This reverts commit 9c6893e0be38b6ca9a56a854226e51dee0a16a5a. > > Signed-off-by: Takashi Sakamoto For reverting a commit, please give the comment why this has to be reverted. At this time I added by myself and applied. thanks, Takashi > --- > sound/firewire/fireworks/fireworks.c | 2 -- > sound/firewire/fireworks/fireworks.h | 1 - > sound/firewire/fireworks/fireworks_stream.c | 3 --- > 3 files changed, 6 deletions(-) > > diff --git a/sound/firewire/fireworks/fireworks.c b/sound/firewire/fireworks/fireworks.c > index c670db4..2682e7e 100644 > --- a/sound/firewire/fireworks/fireworks.c > +++ b/sound/firewire/fireworks/fireworks.c > @@ -248,8 +248,6 @@ efw_probe(struct fw_unit *unit, > err = get_hardware_info(efw); > if (err < 0) > goto error; > - if (entry->model_id == MODEL_ECHO_AUDIOFIRE_2) > - efw->is_af2 = true; > if (entry->model_id == MODEL_ECHO_AUDIOFIRE_9) > efw->is_af9 = true; > > diff --git a/sound/firewire/fireworks/fireworks.h b/sound/firewire/fireworks/fireworks.h > index c33252b..4f0201a 100644 > --- a/sound/firewire/fireworks/fireworks.h > +++ b/sound/firewire/fireworks/fireworks.h > @@ -70,7 +70,6 @@ struct snd_efw { > bool resp_addr_changable; > > /* for quirks */ > - bool is_af2; > bool is_af9; > u32 firmware_version; > > diff --git a/sound/firewire/fireworks/fireworks_stream.c b/sound/firewire/fireworks/fireworks_stream.c > index a0762dd..c55db1b 100644 > --- a/sound/firewire/fireworks/fireworks_stream.c > +++ b/sound/firewire/fireworks/fireworks_stream.c > @@ -172,9 +172,6 @@ int snd_efw_stream_init_duplex(struct snd_efw *efw) > efw->tx_stream.flags |= CIP_DBC_IS_END_EVENT; > /* Fireworks reset dbc at bus reset. */ > efw->tx_stream.flags |= CIP_SKIP_DBC_ZERO_CHECK; > - /* AudioFire2 starts packets with non-zero dbc. */ > - if (efw->is_af2) > - efw->tx_stream.flags |= CIP_SKIP_INIT_DBC_CHECK; > /* AudioFire9 always reports wrong dbs. */ > if (efw->is_af9) > efw->tx_stream.flags |= CIP_WRONG_DBS; > -- > 2.1.4 >