Message ID | 1299555095-2967-1-git-send-email-prabhakar@freescale.com |
---|---|
State | Superseded |
Headers | show |
> Case when ffs return will never arise.This scenario is > already been discussed > on linuxppc-dev@lists.ozlabs.org. Please see below explanation: > sata_fsl_error_intr() is called during device error.The > mentioned scenario > will never comes. It can be observed via code:- > if (cereg) { --> cereg is set on command error. > Means there is at least 1 device present. This all relies on the hardware working properly, and nothing else accidentally clearing the device 'error' bit mask. Being slightly defensive when the out of range value causes an array subscript error seems sensible. It isn't as though the code size or execution time matters here. David -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c index b0214d0..d71e7c2 100644 --- a/drivers/ata/sata_fsl.c +++ b/drivers/ata/sata_fsl.c @@ -1040,12 +1040,15 @@ static void sata_fsl_error_intr(struct ata_port *ap) /* find out the offending link and qc */ if (ap->nr_pmp_links) { + unsigned int dev_num; + dereg = ioread32(hcr_base + DE); iowrite32(dereg, hcr_base + DE); iowrite32(cereg, hcr_base + CE); - if (dereg < ap->nr_pmp_links) { - link = &ap->pmp_link[dereg]; + dev_num = ffs(dereg) - 1; + if (dev_num < ap->nr_pmp_links) { + link = &ap->pmp_link[dev_num]; ehi = &link->eh_info; qc = ata_qc_from_tag(ap, link->active_tag); /*