Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965025AbZLQLg0 (ORCPT ); Thu, 17 Dec 2009 06:36:26 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S964999AbZLQLgZ (ORCPT ); Thu, 17 Dec 2009 06:36:25 -0500 Received: from cantor.suse.de ([195.135.220.2]:40436 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964997AbZLQLgX (ORCPT ); Thu, 17 Dec 2009 06:36:23 -0500 Date: Thu, 17 Dec 2009 12:36:22 +0100 Message-ID: From: Takashi Iwai To: Roel Kluin Cc: LKML , alsa-devel@alsa-project.org, Andrew Morton Subject: Re: [alsa-devel] [PATCH] sound/oss/pss: Fix test of unsigned in pss_reset_dsp() and pss_download_boot() In-Reply-To: <4B2902C3.3080606@gmail.com> References: <4B28085A.6020101@gmail.com> <4B2902C3.3080606@gmail.com> User-Agent: Wanderlust/2.15.6 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.7 Emacs/23.1 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1953 Lines: 65 At Wed, 16 Dec 2009 16:54:43 +0100, Roel Kluin wrote: > > limit and jiffies are unsigned so the test did not work. > > Signed-off-by: Roel Kluin > --- > Found using coccinelle: http://coccinelle.lip6.fr/ > > >> - for (i = 0; i < 32768 && (limit-jiffies >= 0); i++) > >> + for (i = 0; i < 32768 && (limit >= jiffies); i++) > > > > No, it should use time_after_eq(limit, jiffies) instead. > > > > > > thanks, > > > > Takashi > > > > Ok, Applied now. Thanks. Takashi > > diff --git a/sound/oss/pss.c b/sound/oss/pss.c > index 83f5ee2..e19dd5d 100644 > --- a/sound/oss/pss.c > +++ b/sound/oss/pss.c > @@ -269,7 +269,7 @@ static int pss_reset_dsp(pss_confdata * devc) > unsigned long i, limit = jiffies + HZ/10; > > outw(0x2000, REG(PSS_CONTROL)); > - for (i = 0; i < 32768 && (limit-jiffies >= 0); i++) > + for (i = 0; i < 32768 && time_after_eq(limit, jiffies); i++) > inw(REG(PSS_CONTROL)); > outw(0x0000, REG(PSS_CONTROL)); > return 1; > @@ -369,11 +369,11 @@ static int pss_download_boot(pss_confdata * devc, unsigned char *block, int size > outw(0, REG(PSS_DATA)); > > limit = jiffies + HZ/10; > - for (i = 0; i < 32768 && (limit - jiffies >= 0); i++) > + for (i = 0; i < 32768 && time_after_eq(limit, jiffies); i++) > val = inw(REG(PSS_STATUS)); > > limit = jiffies + HZ/10; > - for (i = 0; i < 32768 && (limit-jiffies >= 0); i++) > + for (i = 0; i < 32768 && time_after_eq(limit, jiffies); i++) > { > val = inw(REG(PSS_STATUS)); > if (val & 0x4000) > _______________________________________________ > Alsa-devel mailing list > Alsa-devel@alsa-project.org > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/