diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.60-ref/drivers/scsi/ultrastor.c linux-2.5.60-ac1/drivers/scsi/ultrastor.c
--- linux-2.5.60-ref/drivers/scsi/ultrastor.c 2003-02-14 21:21:36.000000000 +0000
+++ linux-2.5.60-ac1/drivers/scsi/ultrastor.c 2003-02-14 19:57:43.000000000 +0000
@@ -504,7 +504,7 @@
* Brrr, &config.mscp[0].SCint->host) it is something magical....
* XXX and FIXME
*/
- if (request_irq(config.interrupt, do_ultrastor_interrupt, 0, "Ultrastor", &config.mscp[0].SCint->host)) {
+ if (request_irq(config.interrupt, do_ultrastor_interrupt, 0, "Ultrastor", &config.mscp[0].SCint->device->host)) {
printk("Unable to allocate IRQ%u for UltraStor controller.\n",
config.interrupt);
goto out_release_port;
@@ -714,9 +714,9 @@
??? Which other device types should never use the cache? */
my_mscp->ca = SCpnt->device->type != TYPE_TAPE;
- my_mscp->target_id = SCpnt->target;
+ my_mscp->target_id = SCpnt->device->id;
my_mscp->ch_no = 0;
- my_mscp->lun = SCpnt->lun;
+ my_mscp->lun = SCpnt->device->lun;
if (SCpnt->use_sg) {
/* Set scatter/gather flag in SCSI command packet */
my_mscp->sg = TRUE;
@@ -832,7 +832,7 @@
unsigned char old_aborted;
unsigned long flags;
void (*done)(Scsi_Cmnd *);
- struct Scsi_Host *host = SCpnt->host;
+ struct Scsi_Host *host = SCpnt->device->host;
if(config.slot)
return FAILED; /* Do not attempt an abort for the 24f */
@@ -954,7 +954,7 @@
{
unsigned long flags;
int i;
- struct Scsi_Host *host = SCpnt->host;
+ struct Scsi_Host *host = SCpnt->device->host;
#if (ULTRASTOR_DEBUG & UD_RESET)
printk("US14F: reset: called\n");
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Sat Feb 15 2003 - 22:00:58 EST