diff options
-rw-r--r-- | drivers/scsi/esp.c | 6 | ||||
-rw-r--r-- | drivers/scsi/pluto.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/esp.c b/drivers/scsi/esp.c index 891f97f7881e..f6900538be90 100644 --- a/drivers/scsi/esp.c +++ b/drivers/scsi/esp.c | |||
@@ -1147,7 +1147,7 @@ static int __init esp_detect(struct scsi_host_template *tpnt) | |||
1147 | static struct sbus_dev esp_dev; | 1147 | static struct sbus_dev esp_dev; |
1148 | int esps_in_use = 0; | 1148 | int esps_in_use = 0; |
1149 | 1149 | ||
1150 | espchain = 0; | 1150 | espchain = NULL; |
1151 | 1151 | ||
1152 | if (sun4_esp_physaddr) { | 1152 | if (sun4_esp_physaddr) { |
1153 | memset (&esp_dev, 0, sizeof(esp_dev)); | 1153 | memset (&esp_dev, 0, sizeof(esp_dev)); |
@@ -2513,7 +2513,7 @@ static inline void esp_reconnect(struct esp *esp, struct scsi_cmnd *sp) | |||
2513 | ESPLOG(("esp%d: Weird, being reselected but disconnected " | 2513 | ESPLOG(("esp%d: Weird, being reselected but disconnected " |
2514 | "command queue is empty.\n", esp->esp_id)); | 2514 | "command queue is empty.\n", esp->esp_id)); |
2515 | esp->snip = 0; | 2515 | esp->snip = 0; |
2516 | esp->current_SC = 0; | 2516 | esp->current_SC = NULL; |
2517 | sp->SCp.phase = not_issued; | 2517 | sp->SCp.phase = not_issued; |
2518 | append_SC(&esp->issue_SC, sp); | 2518 | append_SC(&esp->issue_SC, sp); |
2519 | } | 2519 | } |
@@ -4148,7 +4148,7 @@ static int esp_work_bus(struct esp *esp) | |||
4148 | } | 4148 | } |
4149 | 4149 | ||
4150 | static espfunc_t isvc_vector[] = { | 4150 | static espfunc_t isvc_vector[] = { |
4151 | 0, | 4151 | NULL, |
4152 | esp_do_phase_determine, | 4152 | esp_do_phase_determine, |
4153 | esp_do_resetbus, | 4153 | esp_do_resetbus, |
4154 | esp_finish_reset, | 4154 | esp_finish_reset, |
diff --git a/drivers/scsi/pluto.c b/drivers/scsi/pluto.c index 7bb0a2e56743..c01b7191fcf5 100644 --- a/drivers/scsi/pluto.c +++ b/drivers/scsi/pluto.c | |||
@@ -45,7 +45,7 @@ static struct ctrl_inquiry { | |||
45 | Scsi_Cmnd cmd; | 45 | Scsi_Cmnd cmd; |
46 | char inquiry[256]; | 46 | char inquiry[256]; |
47 | fc_channel *fc; | 47 | fc_channel *fc; |
48 | } *fcs __initdata = { 0 }; | 48 | } *fcs __initdata; |
49 | static int fcscount __initdata = 0; | 49 | static int fcscount __initdata = 0; |
50 | static atomic_t fcss __initdata = ATOMIC_INIT(0); | 50 | static atomic_t fcss __initdata = ATOMIC_INIT(0); |
51 | DECLARE_MUTEX_LOCKED(fc_sem); | 51 | DECLARE_MUTEX_LOCKED(fc_sem); |