From mboxrd@z Thu Jan 1 00:00:00 1970 From: Takashi Iwai Subject: Re: [PATCH] Make firmware vs driver major version mismatch an error. Date: Tue, 02 Feb 2010 22:42:06 +0100 Message-ID: References: <1265144857-13808-1-git-send-email-linux@audioscience.com> 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 (cantor2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id 161B5103861 for ; Tue, 2 Feb 2010 22:42:07 +0100 (CET) In-Reply-To: <1265144857-13808-1-git-send-email-linux@audioscience.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: alsa-devel-bounces@alsa-project.org Errors-To: alsa-devel-bounces@alsa-project.org To: linux@audioscience.com Cc: Eliot Blennerhassett , alsa-devel@alsa-project.org List-Id: alsa-devel@alsa-project.org At Wed, 03 Feb 2010 10:07:37 +1300, linux@audioscience.com wrote: > > From: Eliot Blennerhassett > > I.e. incompatible firmware will fail driver load. > > Signed-off-by: Eliot Blennerhassett Applied now. Thanks. Takashi > --- > pci/asihpi/hpidspcd.c | 7 +++++++ > 1 files changed, 7 insertions(+), 0 deletions(-) > > diff --git a/pci/asihpi/hpidspcd.c b/pci/asihpi/hpidspcd.c > index 8c0f251..f58d5a0 100644 > --- a/pci/asihpi/hpidspcd.c > +++ b/pci/asihpi/hpidspcd.c > @@ -103,6 +103,13 @@ short HpiDspCode_Open( > goto error2; > } > > + if (header.version / 10000 != HPI_VER_DECIMAL / 10000) { > + HPI_DEBUG_LOG(ERROR, > + "Firmware Major Version mismatch DSP image %d != Driver %d\n", > + header.version, HPI_VER_DECIMAL); > + goto error2; > + } > + > if (header.version != HPI_VER_DECIMAL) { > HPI_DEBUG_LOG(WARNING, > "Version mismatch DSP image %d != Driver %d\n", > -- > 1.7.0.rc0.8.ge3f67d >