diff options
| author | Tejun Heo <tj@kernel.org> | 2017-07-19 10:32:27 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2017-07-19 10:32:27 -0400 |
| commit | 37cbf519e8c66a8a8c143849d3e66646a8fd9641 (patch) | |
| tree | f4849dfbc3994868378013d7ac3c0f779db1a24e /drivers/ata | |
| parent | 6410866c9255b47b35c4768043ed732c71363ed2 (diff) | |
| parent | 59a5e266c3f5c1567508888dd61a45b86daed0fa (diff) | |
Merge branch 'for-4.13-fixes' into for-next
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/libata-scsi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index d462c5a3a7ef..44ba292f2cd7 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -3030,10 +3030,12 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc) static struct ata_device *ata_find_dev(struct ata_port *ap, int devno) { if (!sata_pmp_attached(ap)) { - if (likely(devno < ata_link_max_devices(&ap->link))) + if (likely(devno >= 0 && + devno < ata_link_max_devices(&ap->link))) return &ap->link.device[devno]; } else { - if (likely(devno < ap->nr_pmp_links)) + if (likely(devno >= 0 && + devno < ap->nr_pmp_links)) return &ap->pmp_link[devno].device[0]; } |