Commit 4cc21505 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] ESP: Don't forget to clear ESP_FLAG_RESETTING.
  [SCSI] fusion: fix for BZ 8426 - massive slowdown on SCSI CD/DVD drive
parents caec4e8d 204abf28

drivers/message/fusion/mptspi.c

+5 −3
Original line number Diff line number Diff line
@@ -727,13 +727,15 @@ static int mptspi_slave_configure(struct scsi_device *sdev) 
	struct _MPT_SCSI_HOST *hd =

		(struct _MPT_SCSI_HOST *)sdev->host->hostdata;

	VirtTarget *vtarget = scsi_target(sdev)->hostdata;

	int ret = mptscsih_slave_configure(sdev);

	int ret;



	mptspi_initTarget(hd, vtarget, sdev);



	ret = mptscsih_slave_configure(sdev);



	if (ret)

		return ret;



	mptspi_initTarget(hd, vtarget, sdev);



	ddvprintk((MYIOC_s_INFO_FMT "id=%d min_period=0x%02x"

		" max_offset=0x%02x max_width=%d\n", hd->ioc->name,

		sdev->id, spi_min_period(scsi_target(sdev)),

drivers/scsi/esp_scsi.c

+1 −0
Original line number Diff line number Diff line
@@ -2033,6 +2033,7 @@ static void esp_reset_cleanup(struct esp *esp) 
			starget_for_each_device(tp->starget, NULL,

						esp_clear_hold);

	}

	esp->flags &= ~ESP_FLAG_RESETTING;

}



/* Runs under host->lock */