From owner-freebsd-current  Wed Sep  4 19:45:42 2002
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6E7DB37B400
	for <current@FreeBSD.ORG>; Wed,  4 Sep 2002 19:45:41 -0700 (PDT)
Received: from tasogare.imasy.or.jp (tasogare.imasy.or.jp [202.227.24.5])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0427C43E3B
	for <current@FreeBSD.ORG>; Wed,  4 Sep 2002 19:45:40 -0700 (PDT)
	(envelope-from iwasaki@jp.FreeBSD.org)
Received: from localhost (iwa@tasogare.imasy.or.jp [202.227.24.5])
	by tasogare.imasy.or.jp (8.11.6+3.4W/8.11.6/tasogare) with ESMTP/inet id g852jSY82888;
	Thu, 5 Sep 2002 11:45:29 +0900 (JST)
	(envelope-from iwasaki@jp.FreeBSD.org)
Date: Thu, 05 Sep 2002 11:45:23 +0900 (JST)
Message-Id: <20020905.114523.27774067.iwasaki@jp.FreeBSD.org>
To: sos@freebsd.dk
Cc: current@FreeBSD.ORG
Subject: Re: [PATCH] 'ata_dmasetup: transfer active on this device!'
 problem on resume
From: Mitsuru IWASAKI <iwasaki@jp.FreeBSD.org>
In-Reply-To: <20020905.114039.10290552.iwasaki@jp.FreeBSD.org>
References: <20020905.114039.10290552.iwasaki@jp.FreeBSD.org>
X-Mailer: Mew version 2.1 on Emacs 20.7 / Mule 4.0 (HANANOEN)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-current.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-current>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-current>
X-Loop: FreeBSD.ORG

Sorry, typo...

> @@ -674,6 +712,20 @@
>  	    ad_start(&ch->device[MASTER]);
>  	if (ch->devices & (ATA_ATA_SLAVE) && ch->device[SLAVE].driver)
>  	    ad_start(&ch->device[SLAVE]);
> +    }
> +    if (ch->devices & (ATA_ATA_MASTER) && ch->device[MASTER].driver) {
> + 	if (ch->device[MASTER].suspended && ch->device[MASTER].mode >= ATA_DMA) {
> +	    printf("%s: going to suspend, ignoring.\n", __func__);
> +	    splx(s);
> +	    return;
> +	 }
> +    }
> +    if (ch->devices & (ATA_ATA_SLAVE) && ch->device[SLAVE].driver) {
> + 	if (ch->device[SLAVE].suspended && ch->device[MASTER].mode >= ATA_DMA) {
                                                      ^^^^^^^ SLAVE

Thanks

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message