diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-22 13:07:28 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-22 13:07:28 -0400 |
| commit | ff40c6d3d1437ecdf295b8e39adcb06c3d6021ef (patch) | |
| tree | 3666d029b4bd4df2909dbefd9c7a09e6042b7d32 /drivers/scsi/libata-scsi.c | |
| parent | 8bf62ecee58360749c5f0e68bc97d5e02a6816b1 (diff) | |
| parent | 2a5a68b840cbab31baab2d9b2e1e6de3b289ae1e (diff) | |
| download | linux-ff40c6d3d1437ecdf295b8e39adcb06c3d6021ef.tar.gz linux-ff40c6d3d1437ecdf295b8e39adcb06c3d6021ef.tar.bz2 linux-ff40c6d3d1437ecdf295b8e39adcb06c3d6021ef.zip | |
Merge upstream kernel changes into 'C/H/S support' branch of libata.
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 8b065ef0e39a..5367c10e4db8 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) */ if ((dev->flags & ATA_DFLAG_LBA48) && ((dev->flags & ATA_DFLAG_LOCK_SECTORS) == 0)) { - sdev->host->max_sectors = 2048; + /* + * do not overwrite sdev->host->max_sectors, since + * other drives on this host may not support LBA48 + */ blk_queue_max_sectors(sdev->request_queue, 2048); } } @@ -1008,7 +1011,7 @@ unsigned int ata_scsiop_inq_83(struct ata_scsi_args *args, u8 *rbuf, } /** - * ata_scsiop_noop - + * ata_scsiop_noop - Command handler that simply returns success. * @args: device IDENTIFY data / SCSI command of interest. * @rbuf: Response buffer, to which simulated SCSI cmd output is sent. * @buflen: Response buffer length. |