aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/libata-scsi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/libata-scsi.c')
-rw-r--r--drivers/scsi/libata-scsi.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index fcbf64e741bb..a9b4083a4f67 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -1261,8 +1261,8 @@ static void ata_scsi_translate(struct ata_device *dev, struct scsi_cmnd *cmd,
1261 if (cmd->sc_data_direction == DMA_FROM_DEVICE || 1261 if (cmd->sc_data_direction == DMA_FROM_DEVICE ||
1262 cmd->sc_data_direction == DMA_TO_DEVICE) { 1262 cmd->sc_data_direction == DMA_TO_DEVICE) {
1263 if (unlikely(cmd->request_bufflen < 1)) { 1263 if (unlikely(cmd->request_bufflen < 1)) {
1264 printk(KERN_WARNING "ata%u(%u): WARNING: zero len r/w req\n", 1264 ata_dev_printk(dev, KERN_WARNING,
1265 dev->ap->id, dev->devno); 1265 "WARNING: zero len r/w req\n");
1266 goto err_did; 1266 goto err_did;
1267 } 1267 }
1268 1268
@@ -2200,8 +2200,9 @@ ata_scsi_find_dev(struct ata_port *ap, const struct scsi_device *scsidev)
2200 2200
2201 if (!atapi_enabled || (ap->flags & ATA_FLAG_NO_ATAPI)) { 2201 if (!atapi_enabled || (ap->flags & ATA_FLAG_NO_ATAPI)) {
2202 if (unlikely(dev->class == ATA_DEV_ATAPI)) { 2202 if (unlikely(dev->class == ATA_DEV_ATAPI)) {
2203 printk(KERN_WARNING "ata%u(%u): WARNING: ATAPI is %s, device ignored.\n", 2203 ata_dev_printk(dev, KERN_WARNING,
2204 ap->id, dev->devno, atapi_enabled ? "not supported with this driver" : "disabled"); 2204 "WARNING: ATAPI is %s, device ignored.\n",
2205 atapi_enabled ? "not supported with this driver" : "disabled");
2205 return NULL; 2206 return NULL;
2206 } 2207 }
2207 } 2208 }