D54519.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D54519.diff
View Options

	diff --git a/sys/dev/mfi/mfi.c b/sys/dev/mfi/mfi.c
	--- a/sys/dev/mfi/mfi.c
	+++ b/sys/dev/mfi/mfi.c
	@@ -371,7 +371,7 @@
	if (sc == NULL)
	return EINVAL;

	- device_printf(sc->mfi_dev, "Megaraid SAS driver Ver %s \n",
	+ device_printf(sc->mfi_dev, "LSI MegaRAID SAS driver version: %s\n",
	MEGASAS_VERSION);

	mtx_init(&sc->mfi_io_lock, "MFI I/O lock", NULL, MTX_DEF);
	diff --git a/sys/dev/mrsas/mrsas.c b/sys/dev/mrsas/mrsas.c
	--- a/sys/dev/mrsas/mrsas.c
	+++ b/sys/dev/mrsas/mrsas.c
	@@ -349,15 +349,9 @@
	static int
	mrsas_probe(device_t dev)
	{
	- static u_int8_t first_ctrl = 1;
	struct mrsas_ident *id;

	if ((id = mrsas_find_ident(dev)) != NULL) {
	- if (first_ctrl) {
	- printf("AVAGO MegaRAID SAS FreeBSD mrsas driver version: %s\n",
	- MRSAS_VERSION);
	- first_ctrl = 0;
	- }
	device_set_desc(dev, id->desc);
	/* between BUS_PROBE_DEFAULT and BUS_PROBE_LOW_PRIORITY */
	return (-30);
	@@ -830,6 +824,9 @@
	struct mrsas_softc *sc = device_get_softc(dev);
	uint32_t cmd, error;

	+ device_printf(dev, "AVAGO MegaRAID SAS driver version: %s\n",
	+ MRSAS_VERSION);
	+
	memset(sc, 0, sizeof(struct mrsas_softc));

	/* Look up our softc and initialize its fields. */