--- drivers/scsi/scsiiom.c	Sun Sep 29 18:39:15 2002
+++ ../linux-2.2.22/drivers/scsi/scsiiom.c	Sun Mar 25 19:37:36 2001
@@ -1367,7 +1367,7 @@
     pcmd = pSRB->pcmd; DCB_removed = 0;
     status = pSRB->TargetStatus;
     ptr = (PSCSI_INQDATA) (pcmd->request_buffer);
-    if( pcmd->use_sg && ptr )
+    if( pcmd->use_sg )
 	ptr = (PSCSI_INQDATA) (((PSGL) ptr)->address);
 	
     DEBUG0(printk (" SRBdone (%02x,%08x), SRB %p, pid %li\n", status, pcmd->result,\
@@ -1609,7 +1609,7 @@
     if( pcmd->cmnd[0] == INQUIRY && 
 	(pcmd->result == (DID_OK << 16) || status_byte(pcmd->result) & CHECK_CONDITION) )
      {
-	if (ptr && (ptr->DevType & SCSI_DEVTYPE) == TYPE_NODEV && !DCB_removed)
+	if ((ptr->DevType & SCSI_DEVTYPE) == TYPE_NODEV && !DCB_removed)
 	  {
 	     //printk ("DC390: Type = nodev! (%02i-%i)\n", pcmd->target, pcmd->lun);
 	     /* device not present: remove */