From 3143137e5ee3a5ae5178ccf2c8b187078bbf14b9 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Sun, 1 Nov 1998 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1998-11-01

---
 pc/devata.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pc/devata.c b/pc/devata.c
index b0f987006fa47aab1fd8e684607f73c5e84f10fa..017f8c9394470b3a7ae92da202261f32583c7f2e 100644
--- a/pc/devata.c
+++ b/pc/devata.c
@@ -394,7 +394,6 @@ atactlrprobe(int ctlrno, int irq, int resetok)
 	ctlr->tbdf = BUSUNKNOWN;
 	ctlr->lastcmd = 0xFF;
 
-
 	/*
 	 * Attempt to check the existence of drives on the controller
 	 * by issuing a 'check device diagnostics' command.
@@ -418,6 +417,7 @@ atactlrprobe(int ctlrno, int irq, int resetok)
 			DPRINT("ata%d: Srst status 0x%uX/0x%uX/0x%uX\n", ctlrno,
 				inb(port+Pstatus), inb(port+Pcylmsb), inb(port+Pcyllsb));
 			xfree(ctlr);
+			return -1;
 		}
 	}
 
@@ -425,6 +425,7 @@ atactlrprobe(int ctlrno, int irq, int resetok)
 retry:
 	atapi = 0;
 	mask = 0;
+	status = inb(port+Pstatus);
 	DPRINT("ata%d: ATAPI 0x%uX 0x%uX 0x%uX\n", ctlrno, status,
 		inb(port+Pcylmsb), inb(port+Pcyllsb));
 	if(/*status == 0 &&*/ inb(port+Pcylmsb) == 0xEB && inb(port+Pcyllsb) == 0x14){