From owner-freebsd-current@FreeBSD.ORG  Thu Jun 26 16:04:56 2003
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
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 0395B37B401; Thu, 26 Jun 2003 16:04:56 -0700 (PDT)
Received: from salmon.maths.tcd.ie (salmon.maths.tcd.ie [134.226.81.11])
	by mx1.FreeBSD.org (Postfix) with SMTP
	id 8375943FEA; Thu, 26 Jun 2003 16:04:54 -0700 (PDT)
	(envelope-from iedowse@maths.tcd.ie)
Received: from walton.maths.tcd.ie by salmon.maths.tcd.ie with SMTP
          id <aa89273@salmon>; 27 Jun 2003 00:04:53 +0100 (BST)
To: "M. Warner Losh" <imp@bsdimp.com>
In-Reply-To: Your message of "Thu, 26 Jun 2003 13:14:17 MDT."
             <20030626.131417.101814768.imp@bsdimp.com> 
Date: Fri, 27 Jun 2003 00:04:52 +0100
From: Ian Dowse <iedowse@maths.tcd.ie>
Message-ID: <200306270004.aa89273@salmon.maths.tcd.ie>
cc: wpaul@FreeBSD.ORG
cc: sos@spider.deepcore.dk
cc: current@FreeBSD.ORG
Subject: Re: Heads up: checking in change to ata-card.c 
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Jun 2003 23:04:56 -0000

In message <20030626.131417.101814768.imp@bsdimp.com>, "M. Warner Losh" writes:
>Here's a better patch, basesd on wpaul's input.  Bill, can you try it
>an see if it works for you?  If so, i would be better to commit this
>one.  If not, I'll work with you to fix it. 

FYI, I have a no-name ("PCMCIA"/"CD-ROM") drive that also requires
failure of the second IO range to be made non-fatal. How about just
deleting the `else' clause as in the patch below? It seems that
this can only affect CD-ROM drives that were otherwise not working,
so it should be fairly safe.

Ian

Index: ata-card.c
===================================================================
RCS file: /dump/FreeBSD-CVS/src/sys/dev/ata/ata-card.c,v
retrieving revision 1.14
diff -u -r1.14 ata-card.c
--- ata-card.c	17 Jun 2003 12:33:53 -0000	1.14
+++ ata-card.c	26 Jun 2003 23:00:01 -0000
@@ -131,10 +131,6 @@
 			     start + ATA_ALTOFFSET, ATA_ALTIOSIZE);
 	}
     }
-    else {
-	bus_release_resource(dev, SYS_RES_IOPORT, rid, io);
-	return ENXIO;
-    }
 
     /* allocate the altport range */
     rid = ATA_ALTADDR_RID;