patch-2.2.11 linux/drivers/sgi/char/sgiserial.h

• Lines: 31
• Date: Mon Aug 9 12:04:40 1999
• Orig file: v2.2.10/linux/drivers/sgi/char/sgiserial.h
• Orig date: Wed Dec 10 10:31:11 1997

diff -u --recursive --new-file v2.2.10/linux/drivers/sgi/char/sgiserial.h linux/drivers/sgi/char/sgiserial.h
@@ -412,7 +412,8 @@
 
 	udelay(2);
 	channel->control = ERR_RES;
-	junk = ioc_icontrol->istat0;
+	if (ioc_icontrol)
+		junk = ioc_icontrol->istat0;
 }
 
 extern inline void ZS_CLEARFIFO(struct sgi_zschannel *channel)
@@ -421,11 +422,17 @@
 
 	udelay(2);
 	junk = channel->data;
-	udelay(2); junk = ioc_icontrol->istat0;
+	udelay(2);
+	if (ioc_icontrol)
+		junk = ioc_icontrol->istat0;
 	junk = channel->data;
-	udelay(2); junk = ioc_icontrol->istat0;
+	udelay(2);
+	if (ioc_icontrol)
+		junk = ioc_icontrol->istat0;
 	junk = channel->data;
-	udelay(2); junk = ioc_icontrol->istat0;
+	udelay(2);
+	if (ioc_icontrol)
+		junk = ioc_icontrol->istat0;
 }
 
 #if 0