D6817.id17640.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D6817.id17640.diff
View Options

	Index: head/sys/dev/iwm/if_iwm.c
	===================================================================
	--- head/sys/dev/iwm/if_iwm.c
	+++ head/sys/dev/iwm/if_iwm.c
	@@ -1823,7 +1823,7 @@

	struct iwm_nvm_section {
	uint16_t length;
	- const uint8_t *data;
	+ uint8_t *data;
	};

	static int
	@@ -1860,6 +1860,8 @@
	"%s: Read NVM\n",
	__func__);

	+ memset(nvm_sections, 0, sizeof(nvm_sections));
	+
	/* TODO: find correct NVM max size for a section */
	nvm_buffer = malloc(IWM_OTP_LOW_IMAGE_SIZE, M_DEVBUF, M_NOWAIT);
	if (nvm_buffer == NULL)
	@@ -1883,10 +1885,15 @@
	nvm_sections[section].length = len;
	}
	free(nvm_buffer, M_DEVBUF);
	- if (error)
	- return error;
	+ if (error == 0)
	+ error = iwm_parse_nvm_sections(sc, nvm_sections);

	- return iwm_parse_nvm_sections(sc, nvm_sections);
	+ for (i = 0; i < IWM_NVM_NUM_OF_SECTIONS; i++) {
	+ if (nvm_sections[i].data != NULL)
	+ free(nvm_sections[i].data, M_DEVBUF);
	+ }
	+
	+ return error;
	}

	/*
	@@ -5008,6 +5015,7 @@
	ieee80211_ifdetach(&sc->sc_ic);

	/* Free descriptor rings */
	+ iwm_free_rx_ring(sc, &sc->rxq);
	for (i = 0; i < nitems(sc->txq); i++)
	iwm_free_tx_ring(sc, &sc->txq[i]);