Merge master.kernel.org:/home/rmk/linux-2.6-arm

[powerpc.git] / drivers / scsi / esp.c

diff --git a/drivers/scsi/esp.c b/drivers/scsi/esp.c
index 891f97f..87a8c3d 100644 (file)
--- a/drivers/scsi/esp.c
+++ b/drivers/scsi/esp.c
@@ -1147,7 +1147,7 @@ static int __init esp_detect(struct scsi_host_template *tpnt)
        static struct sbus_dev esp_dev;
        int esps_in_use = 0;
 
-       espchain = 0;
+       espchain = NULL;
 
        if (sun4_esp_physaddr) {
                memset (&esp_dev, 0, sizeof(esp_dev));
@@ -2068,14 +2068,12 @@ static int esp_reset(struct scsi_cmnd *SCptr)
 {
        struct esp *esp = (struct esp *) SCptr->device->host->hostdata;
 
+       spin_lock_irq(esp->ehost->host_lock);
        (void) esp_do_resetbus(esp);
-
        spin_unlock_irq(esp->ehost->host_lock);
 
        wait_event(esp->reset_queue, (esp->resetting_bus == 0));
 
-       spin_lock_irq(esp->ehost->host_lock);
-
        return SUCCESS;
 }
 
@@ -2513,7 +2511,7 @@ static inline void esp_reconnect(struct esp *esp, struct scsi_cmnd *sp)
                ESPLOG(("esp%d: Weird, being reselected but disconnected "
                        "command queue is empty.\n", esp->esp_id));
        esp->snip = 0;
-       esp->current_SC = 0;
+       esp->current_SC = NULL;
        sp->SCp.phase = not_issued;
        append_SC(&esp->issue_SC, sp);
 }
@@ -4148,7 +4146,7 @@ static int esp_work_bus(struct esp *esp)
 }
 
 static espfunc_t isvc_vector[] = {
-       0,
+       NULL,
        esp_do_phase_determine,
        esp_do_resetbus,
        esp_finish_reset,