28c28
< __FBSDID("$FreeBSD: head/sys/cam/scsi/scsi_enc.c 291126 2015-11-21 10:22:01Z mav $");
---
> __FBSDID("$FreeBSD: head/sys/cam/scsi/scsi_enc.c 293350 2016-01-07 20:22:55Z kib $");
267,270d266
< if (periph == NULL) {
< return (ENXIO);
< }
<
305,306d300
< if (periph == NULL)
< return (ENXIO);
367,369d360
< if (periph == NULL)
< return (ENXIO);
<
907a899
> struct make_dev_args args;
990,993c982,990
< enc->enc_dev = make_dev(&enc_cdevsw, periph->unit_number,
< UID_ROOT, GID_OPERATOR, 0600, "%s%d",
< periph->periph_name, periph->unit_number);
<
---
> make_dev_args_init(&args);
> args.mda_devsw = &enc_cdevsw;
> args.mda_unit = periph->unit_number;
> args.mda_uid = UID_ROOT;
> args.mda_gid = GID_OPERATOR;
> args.mda_mode = 0600;
> args.mda_si_drv1 = periph;
> err = make_dev_s(&args, &enc->enc_dev, "%s%d", periph->periph_name,
> periph->unit_number);
995c992,995
< enc->enc_dev->si_drv1 = periph;
---
> if (err != 0) {
> cam_periph_release_locked(periph);
> return (CAM_REQ_CMP_ERR);
> }