49c49
< __FBSDID("$FreeBSD: head/sys/cam/scsi/scsi_cd.c 210471 2010-07-25 15:43:52Z mav $");
---
> __FBSDID("$FreeBSD: head/sys/cam/scsi/scsi_cd.c 219056 2011-02-26 14:58:54Z nwhitehorn $");
726a727,732
> cam_strvis(softc->disk->d_descr, cgd->inq_data.vendor,
> sizeof(cgd->inq_data.vendor), sizeof(softc->disk->d_descr));
> strlcat(softc->disk->d_descr, " ", sizeof(softc->disk->d_descr));
> cam_strvis(&softc->disk->d_descr[strlen(softc->disk->d_descr)],
> cgd->inq_data.product, sizeof(cgd->inq_data.product),
> sizeof(softc->disk->d_descr) - strlen(softc->disk->d_descr));