28c28
< __FBSDID("$FreeBSD: head/sys/dev/mps/mps_sas.c 224973 2011-08-18 16:07:41Z ken $");
---
> __FBSDID("$FreeBSD: head/sys/dev/mps/mps_sas.c 225950 2011-10-03 20:32:55Z ken $");
1493d1492
< u_int sense_len;
1669,1672c1668,1677
< sense_len = MIN(rep->SenseCount,
< sizeof(struct scsi_sense_data));
< if (sense_len < rep->SenseCount)
< ccb->csio.sense_resid = rep->SenseCount - sense_len;
---
> int sense_len;
>
> if (rep->SenseCount < ccb->csio.sense_len)
> ccb->csio.sense_resid = ccb->csio.sense_len -
> rep->SenseCount;
> else
> ccb->csio.sense_resid = 0;
>
> sense_len = min(rep->SenseCount, ccb->csio.sense_len -
> ccb->csio.sense_resid);