Index: dev/scsipi/cd.c
===================================================================
RCS file: /cvsroot/src/sys/dev/scsipi/cd.c,v
retrieving revision 1.312
diff -u -p -r1.312 cd.c
--- dev/scsipi/cd.c	2 Jul 2013 15:05:53 -0000	1.312
+++ dev/scsipi/cd.c	7 Sep 2013 06:54:02 -0000
@@ -1246,7 +1246,7 @@ cdioctl(dev_t dev, u_long cmd, void *add
 	struct scsipi_periph *periph = cd->sc_periph;
 	struct cd_formatted_toc toc;
 	int part = CDPART(dev);
-	int error = 0;
+	int error;
 	int s;
 #ifdef __HAVE_OLD_DISKLABEL
 	struct disklabel *newlabel = NULL;
@@ -1305,6 +1305,7 @@ cdioctl(dev_t dev, u_long cmd, void *add
 	if (error != EPASSTHROUGH)
 		return (error);
 
+	error = 0;
 	switch (cmd) {
 	case DIOCGDINFO:
 		*(struct disklabel *)addr = *(cd->sc_dk.dk_label);
Index: dev/scsipi/sd.c
===================================================================
RCS file: /cvsroot/src/sys/dev/scsipi/sd.c,v
retrieving revision 1.301
diff -u -p -r1.301 sd.c
--- dev/scsipi/sd.c	13 Jun 2013 00:55:01 -0000	1.301
+++ dev/scsipi/sd.c	7 Sep 2013 06:54:03 -0000
@@ -998,7 +998,7 @@ sdioctl(dev_t dev, u_long cmd, void *add
 	struct sd_softc *sd = device_lookup_private(&sd_cd, SDUNIT(dev));
 	struct scsipi_periph *periph = sd->sc_periph;
 	int part = SDPART(dev);
-	int error = 0;
+	int error;
 	int s;
 #ifdef __HAVE_OLD_DISKLABEL
 	struct disklabel *newlabel = NULL;
@@ -1040,6 +1040,7 @@ sdioctl(dev_t dev, u_long cmd, void *add
 	if (error != EPASSTHROUGH)
 		return (error);
 
+	error = 0;
 	switch (cmd) {
 	case DIOCGDINFO:
 		*(struct disklabel *)addr = *(sd->sc_dk.dk_label);