Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 23 Nov 2015 12:10:29 +0000 (UTC)
From:      Steven Hartland <smh@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r291194 - stable/10/sys/dev/ixl
Message-ID:  <201511231210.tANCATi3051003@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: smh
Date: Mon Nov 23 12:10:29 2015
New Revision: 291194
URL: https://svnweb.freebsd.org/changeset/base/291194

Log:
  MFC r290708:
  
  Fix ixl debug sysctls panic
  
  Sponsored by:	Multiplay

Modified:
  stable/10/sys/dev/ixl/if_ixl.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/ixl/if_ixl.c
==============================================================================
--- stable/10/sys/dev/ixl/if_ixl.c	Mon Nov 23 11:19:00 2015	(r291193)
+++ stable/10/sys/dev/ixl/if_ixl.c	Mon Nov 23 12:10:29 2015	(r291194)
@@ -4676,17 +4676,9 @@ ixl_sysctl_hw_res_alloc(SYSCTL_HANDLER_A
 	}
 
 	error = sbuf_finish(buf);
-	if (error) {
-		device_printf(dev, "Error finishing sbuf: %d\n", error);
-		sbuf_delete(buf);
-		return error;
-	}
-
-	error = sysctl_handle_string(oidp, sbuf_data(buf), sbuf_len(buf), req);
-	if (error)
-		device_printf(dev, "sysctl error: %d\n", error);
 	sbuf_delete(buf);
-	return error;
+
+	return (error);
 }
 
 /*
@@ -4789,15 +4781,6 @@ ixl_sysctl_switch_config(SYSCTL_HANDLER_
 	sbuf_delete(nmbuf);
 
 	error = sbuf_finish(buf);
-	if (error) {
-		device_printf(dev, "Error finishing sbuf: %d\n", error);
-		sbuf_delete(buf);
-		return error;
-	}
-
-	error = sysctl_handle_string(oidp, sbuf_data(buf), sbuf_len(buf), req);
-	if (error)
-		device_printf(dev, "sysctl error: %d\n", error);
 	sbuf_delete(buf);
 
 	return (error);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511231210.tANCATi3051003>