From dc6b9c2d6e77382ad3cd1accac28b7900a7b2a24 Mon Sep 17 00:00:00 2001
From: Lukas Ertl <le@FreeBSD.org>
Date: Tue, 19 Oct 2004 10:29:00 +0000
Subject: [PATCH] Return the unit number of a channel instead of a hardcoded
 '1' from the ATA pccard locking function.  This makes pccard devices like
 Compact Flash cards work again.

PR:             kern/72805
Submitted by:   James E. Flemer <jflemer@alum.rpi.edu>
MFC in:         2 days
---
 sys/dev/ata/ata-card.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/dev/ata/ata-card.c b/sys/dev/ata/ata-card.c
index 68d8bde5bfa..4c63faeb85f 100644
--- a/sys/dev/ata/ata-card.c
+++ b/sys/dev/ata/ata-card.c
@@ -91,7 +91,7 @@ ata_pccard_match(device_t dev)
 static int
 ata_pccard_locknoop(struct ata_channel *ch, int type)
 {
-    return 1;
+    return ch->unit;
 }
 
 static void