patch-2.3.29 linux/drivers/i2o/i2o_scsi.c

• Lines: 51
• Date: Tue Nov 23 10:36:14 1999
• Orig file: v2.3.28/linux/drivers/i2o/i2o_scsi.c
• Orig date: Thu Nov 11 20:11:35 1999

diff -u --recursive --new-file v2.3.28/linux/drivers/i2o/i2o_scsi.c linux/drivers/i2o/i2o_scsi.c
@@ -297,12 +297,12 @@
 {
 	u8 reply[8];
 	
-	if(i2o_query_scalar(c, d->lct_data->tid, 0, 3, reply, 4))
+	if(i2o_query_scalar(c, d->lct_data->tid, 0, 3, reply, 4)<0)
 		return -1;
 		
 	*target=reply[0];
 	
-	if(i2o_query_scalar(c, d->lct_data->tid, 0, 4, reply, 8))
+	if(i2o_query_scalar(c, d->lct_data->tid, 0, 4, reply, 8)<0)
 		return -1;
 
 	*lun=reply[1];
@@ -328,7 +328,7 @@
 	for(unit=c->devices;unit!=NULL;unit=unit->next)
 	{
 		dprintk(("Class %03X, parent %d, want %d.\n",
-			unit->lct_data->class_id, unit->lct_data->parent, d->lct_data->tid));
+			unit->lct_data->class_id, unit->lct_data->parent_tid, d->lct_data->tid));
 			
 		/* Only look at scsi and fc devices */
 		if (    (unit->lct_data->class_id != I2O_CLASS_SCSI_PERIPHERAL)
@@ -337,7 +337,7 @@
 			continue;
 
 		/* On our bus ? */
-		dprintk(("Found a disk.\n"));
+		dprintk(("Found a disk (%d).\n", unit->lct_data->tid));
 		if ((unit->lct_data->parent_tid == d->lct_data->tid)
 		     || (unit->lct_data->parent_tid == d->lct_data->parent_tid)
 		   )
@@ -346,7 +346,7 @@
 			dprintk(("Its ours.\n"));
 			if(i2o_find_lun(c, unit, &target, &lun)==-1)
 			{
-				printk(KERN_ERR "i2o_scsi: Unable to get lun for tid %d.\n", d->lct_data->tid);
+				printk(KERN_ERR "i2o_scsi: Unable to get lun for tid %d.\n", unit->lct_data->tid);
 				continue;
 			}
 			dprintk(("Found disk %d %d.\n", target, lun));
@@ -429,7 +429,7 @@
 			 *	bus_adapter, SCSI (obsolete), or FibreChannel busses only
 			 */
 			if(    (d->lct_data->class_id!=I2O_CLASS_BUS_ADAPTER_PORT)	// bus_adapter
-			    && (d->lct_data->class_id!=I2O_CLASS_FIBRE_CHANNEL_PORT)	// FC_PORT
+//			    && (d->lct_data->class_id!=I2O_CLASS_FIBRE_CHANNEL_PORT)	// FC_PORT
 			  )
 				continue;