Index: mscp_disk.c
===================================================================
RCS file: /cvsroot/src/sys/dev/mscp/mscp_disk.c,v
retrieving revision 1.88
diff -u -r1.88 mscp_disk.c
--- mscp_disk.c	26 Apr 2015 15:15:20 -0000	1.88
+++ mscp_disk.c	28 Mar 2016 22:24:29 -0000
@@ -724,6 +724,29 @@
 }
 
 /*
+ * Initialize drive geometry data from disklabel
+ */
+static void
+ra_set_geometry(struct ra_softc *ra)
+{
+	struct	disklabel *dl;
+	struct	disk_geom *dg;
+
+	dl = ra->ra_disk.dk_label;
+	dg = &ra->ra_disk.dk_geom;
+
+	memset(dg, 0, sizeof(*dg));
+	dg->dg_secsize = dl->d_secsize;
+	dg->dg_nsectors = dl->d_nsectors;
+	dg->dg_ntracks = dl->d_ntracks;
+
+	dg->dg_ncylinders = dl->d_ncylinders;
+	dg->dg_secperunit = dl->d_secperunit;
+
+	disk_set_info(ra->ra_dev, &ra->ra_disk, NULL);
+}
+
+/*
  * (Try to) put the drive online. This is done the first time the
  * drive is opened, or if it har fallen offline.
  */
@@ -968,6 +991,7 @@
 		dl->d_rpm = 300;
 	}
 	rrmakelabel(dl, ra->ra_mediaid);
+	ra_set_geometry(ra);
 
 	return (MSCP_DONE);
 }