diff options
Diffstat (limited to 'drivers/scsi/libata-scsi.c')
-rw-r--r-- | drivers/scsi/libata-scsi.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c index 4c96df060c3b..7a4adc4c8f09 100644 --- a/drivers/scsi/libata-scsi.c +++ b/drivers/scsi/libata-scsi.c | |||
@@ -347,7 +347,10 @@ int ata_scsi_slave_config(struct scsi_device *sdev) | |||
347 | */ | 347 | */ |
348 | if ((dev->flags & ATA_DFLAG_LBA48) && | 348 | if ((dev->flags & ATA_DFLAG_LBA48) && |
349 | ((dev->flags & ATA_DFLAG_LOCK_SECTORS) == 0)) { | 349 | ((dev->flags & ATA_DFLAG_LOCK_SECTORS) == 0)) { |
350 | sdev->host->max_sectors = 2048; | 350 | /* |
351 | * do not overwrite sdev->host->max_sectors, since | ||
352 | * other drives on this host may not support LBA48 | ||
353 | */ | ||
351 | blk_queue_max_sectors(sdev->request_queue, 2048); | 354 | blk_queue_max_sectors(sdev->request_queue, 2048); |
352 | } | 355 | } |
353 | } | 356 | } |
@@ -944,7 +947,7 @@ unsigned int ata_scsiop_inq_83(struct ata_scsi_args *args, u8 *rbuf, | |||
944 | } | 947 | } |
945 | 948 | ||
946 | /** | 949 | /** |
947 | * ata_scsiop_noop - | 950 | * ata_scsiop_noop - Command handler that simply returns success. |
948 | * @args: device IDENTIFY data / SCSI command of interest. | 951 | * @args: device IDENTIFY data / SCSI command of interest. |
949 | * @rbuf: Response buffer, to which simulated SCSI cmd output is sent. | 952 | * @rbuf: Response buffer, to which simulated SCSI cmd output is sent. |
950 | * @buflen: Response buffer length. | 953 | * @buflen: Response buffer length. |