Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f73832f authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] drivers/scsi NULL noise removal 



NULL noise in sbus scsi drivers got missed

Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f815e818

drivers/scsi/esp.c

+3 −3
Original line number Diff line number Diff line
@@ -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));
@@ -2513,7 +2513,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 +4148,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,

drivers/scsi/pluto.c

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static struct ctrl_inquiry { 
	Scsi_Cmnd cmd;

	char inquiry[256];

	fc_channel *fc;

} *fcs __initdata = { 0 };

} *fcs __initdata;

static int fcscount __initdata = 0;

static atomic_t fcss __initdata = ATOMIC_INIT(0);

DECLARE_MUTEX_LOCKED(fc_sem);