Jeff Garzik wrote:
> Albert Lee wrote:
>
>>> diff --git a/drivers/scsi/sata_vsc.c b/drivers/scsi/sata_vsc.c
>>> index 9646c39..0372be7 100644
>>> --- a/drivers/scsi/sata_vsc.c
>>> +++ b/drivers/scsi/sata_vsc.c
>>> @@ -221,14 +221,21 @@ static irqreturn_t vsc_sata_interrupt (i
>>>
>>> ap = host_set->ports[i];
>>>
>>> - if (ap && !(ap->flags &
>>> - (ATA_FLAG_DISABLED|ATA_FLAG_NOINTR))) {
>>> + if (is_vsc_sata_int_err(i, int_status)) {
>>> + u32 err_status;
>>> + printk(KERN_DEBUG "%s: ignoring interrupt(s)\n",
>>> __FUNCTION__);
>>> + err_status = ap ? vsc_sata_scr_read(ap, SCR_ERROR) : 0;
>>> + vsc_sata_scr_write(ap, SCR_ERROR, err_status);
>>> + handled++;
>>> + }
>>> +
>>> + if (ap && !(ap->flags & ATA_FLAG_DISABLED)) {
>>> struct ata_queued_cmd *qc;
>>>
>>
>>
>> The if(is_vsc_sata_int_err(i, int_status)) { } block is not irq-pio
>> related.
>> Maybe it is from somewhere else?
>
>
> It is from the merge I did with upstream, which conflicted in this area.
> Is it not correct somehow, or just unexpected?
>
Just unexpected. The merge looks ok.
--
albert
-
: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
