tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 4cc21505 caec4e8d

+6 -3
unified split
+5 -3
drivers/message/fusion/mptspi.c
··· 727 727 struct _MPT_SCSI_HOST *hd = 728 728 (struct _MPT_SCSI_HOST *)sdev->host->hostdata; 729 729 VirtTarget *vtarget = scsi_target(sdev)->hostdata; 730 - int ret = mptscsih_slave_configure(sdev); 730 + int ret; 731 + 732 + mptspi_initTarget(hd, vtarget, sdev); 733 + 734 + ret = mptscsih_slave_configure(sdev); 731 735 732 736 if (ret) 733 737 return ret; 734 - 735 - mptspi_initTarget(hd, vtarget, sdev); 736 738 737 739 ddvprintk((MYIOC_s_INFO_FMT "id=%d min_period=0x%02x" 738 740 " max_offset=0x%02x max_width=%d\n", hd->ioc->name,
+1
drivers/scsi/esp_scsi.c
··· 2033 2033 starget_for_each_device(tp->starget, NULL, 2034 2034 esp_clear_hold); 2035 2035 } 2036 + esp->flags &= ~ESP_FLAG_RESETTING; 2036 2037 } 2037 2038 2038 2039 /* Runs under host->lock */