From 144da9f38ef5bdb136a9f2f111b7fe7724a05f9d Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Mon, 7 Aug 2006 20:48:00 +0200 Subject: [PATCH] --- yaml --- r: 37303 b: refs/heads/master c: c394f1eafef61c6666f5876afde6110a276c4c9f h: refs/heads/master i: 37301: fd58b36689f16e152510a08ee02caab408a25086 37299: 2324e9d127fcad79dc5fb81509abfa4f7f72233e 37295: 2d33257a41b5d6726d40f8897f399df2c58fab69 v: v3 --- [refs] | 2 +- trunk/drivers/ieee1394/sbp2.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 70d3631c30bf..4c44324deb09 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87730d045913f28e636cf53ad35950069a85c7f2 +refs/heads/master: c394f1eafef61c6666f5876afde6110a276c4c9f diff --git a/trunk/drivers/ieee1394/sbp2.c b/trunk/drivers/ieee1394/sbp2.c index f192596329e3..6986ac188281 100644 --- a/trunk/drivers/ieee1394/sbp2.c +++ b/trunk/drivers/ieee1394/sbp2.c @@ -2515,6 +2515,7 @@ static int sbp2scsi_slave_alloc(struct scsi_device *sdev) (struct scsi_id_instance_data *)sdev->host->hostdata[0]; scsi_id->sdev = sdev; + sdev->allow_restart = 1; if (scsi_id->workarounds & SBP2_WORKAROUND_INQUIRY_36) sdev->inquiry_len = 36; @@ -2534,9 +2535,6 @@ static int sbp2scsi_slave_configure(struct scsi_device *sdev) sdev->skip_ms_page_8 = 1; if (scsi_id->workarounds & SBP2_WORKAROUND_FIX_CAPACITY) sdev->fix_capacity = 1; - if (scsi_id->ne->guid_vendor_id == 0x0010b9 && /* Maxtor's OUI */ - (sdev->type == TYPE_DISK || sdev->type == TYPE_RBC)) - sdev->allow_restart = 1; return 0; }