aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2006-08-07 14:48:00 -0400
committerStefan Richter <stefanr@s5r6.in-berlin.de>2006-09-17 13:53:01 -0400
commitc394f1eafef61c6666f5876afde6110a276c4c9f (patch)
tree687d5ee149996dd6bdd8da1a190d418569f51e0a
parent87730d045913f28e636cf53ad35950069a85c7f2 (diff)
ieee1394: sbp2: enable auto spin-up for all SBP-2 devices
This is a follow-up to patch "ieee1394: sbp2: enable auto spin-up for Maxtor disks". When I 'ejected' an OXUF922 based HDD from a Mac OS X box, it was spun down by the Mac and did not spin up by itself when attached to a Linux box right after that. The first SCSI command that required the bridge to access the drive ended in sda:<6>sd 18:0:0:0: Device not ready: <6>: Current: sense key: Not Ready Additional sense: Logical unit not ready, initializing cmd. required Therefore the flag which instructs scsi_mod to send START STOP UNIT with START=1 ("make medium ready") after such a condition is now enabled unconditionally for all FireWire storage devices. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
-rw-r--r--drivers/ieee1394/sbp2.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index f192596329e3..6986ac188281 100644
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -2515,6 +2515,7 @@ static int sbp2scsi_slave_alloc(struct scsi_device *sdev)
2515 (struct scsi_id_instance_data *)sdev->host->hostdata[0]; 2515 (struct scsi_id_instance_data *)sdev->host->hostdata[0];
2516 2516
2517 scsi_id->sdev = sdev; 2517 scsi_id->sdev = sdev;
2518 sdev->allow_restart = 1;
2518 2519
2519 if (scsi_id->workarounds & SBP2_WORKAROUND_INQUIRY_36) 2520 if (scsi_id->workarounds & SBP2_WORKAROUND_INQUIRY_36)
2520 sdev->inquiry_len = 36; 2521 sdev->inquiry_len = 36;
@@ -2534,9 +2535,6 @@ static int sbp2scsi_slave_configure(struct scsi_device *sdev)
2534 sdev->skip_ms_page_8 = 1; 2535 sdev->skip_ms_page_8 = 1;
2535 if (scsi_id->workarounds & SBP2_WORKAROUND_FIX_CAPACITY) 2536 if (scsi_id->workarounds & SBP2_WORKAROUND_FIX_CAPACITY)
2536 sdev->fix_capacity = 1; 2537 sdev->fix_capacity = 1;
2537 if (scsi_id->ne->guid_vendor_id == 0x0010b9 && /* Maxtor's OUI */
2538 (sdev->type == TYPE_DISK || sdev->type == TYPE_RBC))
2539 sdev->allow_restart = 1;
2540 return 0; 2538 return 0;
2541} 2539}
2542 2540