30c30
< __FBSDID("$FreeBSD: head/sbin/camcontrol/camcontrol.c 225018 2011-08-19 21:33:46Z mav $");
---
> __FBSDID("$FreeBSD: head/sbin/camcontrol/camcontrol.c 225950 2011-10-03 20:32:55Z ken $");
1910c1910,1912
< scsi_extract_sense(sense, &error_code, &sense_key, &asc, &ascq);
---
> scsi_extract_sense_len(sense, ccb->csio.sense_len -
> ccb->csio.sense_resid, &error_code, &sense_key, &asc,
> &ascq, /*show_errors*/ 1);
3801,3802c3803,3805
< scsi_extract_sense(sense, &error_code, &sense_key,
< &asc, &ascq);
---
> scsi_extract_sense_len(sense, ccb->csio.sense_len -
> ccb->csio.sense_resid, &error_code, &sense_key,
> &asc, &ascq, /*show_errors*/ 1);
3813,3815c3816,3819
< if ((sense->extra_len >= 10)
< && ((sense->sense_key_spec[0] &
< SSD_SCS_VALID) != 0)
---
> uint8_t sks[3];
>
> if ((scsi_get_sks(sense, ccb->csio.sense_len -
> ccb->csio.sense_resid, sks) == 0)
3820,3821c3824
< val = scsi_2btoul(
< &sense->sense_key_spec[1]);
---
> val = scsi_2btoul(&sks[1]);