33c33
< __FBSDID("$FreeBSD: head/sys/cam/scsi/scsi_sg.c 288420 2015-09-30 13:31:37Z mav $");
---
> __FBSDID("$FreeBSD: head/sys/cam/scsi/scsi_sg.c 293350 2016-01-07 20:22:55Z kib $");
303c303,304
< int no_tags;
---
> struct make_dev_args args;
> int no_tags, error;
364,366c365,378
< softc->dev = make_dev(&sg_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 = &sg_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;
> error = make_dev_s(&args, &softc->dev, "%s%d",
> periph->periph_name, periph->unit_number);
> if (error != 0) {
> cam_periph_lock(periph);
> cam_periph_release_locked(periph);
> return (CAM_REQ_CMP_ERR);
> }
376d387
< softc->dev->si_drv1 = periph;
432,434d442
< if (periph == NULL)
< return (ENXIO);
<
471,472d478
< if (periph == NULL)
< return (ENXIO);
509,511d514
< if (periph == NULL)
< return (ENXIO);
<