D29514.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D29514.diff
View Options

	diff --git a/sys/compat/linuxkpi/common/src/linux_firmware.c b/sys/compat/linuxkpi/common/src/linux_firmware.c
	--- a/sys/compat/linuxkpi/common/src/linux_firmware.c
	+++ b/sys/compat/linuxkpi/common/src/linux_firmware.c
	@@ -85,9 +85,10 @@
	fwimg = fw_name;
	fbdfw = firmware_get_flags(fwimg, flags);
	}
	- /* (3) Flatten '/' and then '.' to '_' and try with adjusted name. */
	+ /* (3) Flatten '/', '.' and '-' to '_' and try with adjusted name. */
	if (fbdfw == NULL &&
	- (strchr(fw_name, '/') != NULL \|\| strchr(fw_name, '.') != NULL)) {
	+ (strchr(fw_name, '/') != NULL \|\| strchr(fw_name, '.') != NULL \|\|
	+ strchr(fw_name, '-'))) {
	fwimg = strdup(fw_name, M_LKPI_FW);
	if (fwimg != NULL) {
	while ((p = strchr(fwimg, '/')) != NULL)
	@@ -98,6 +99,11 @@
	*p = '_';
	fbdfw = firmware_get_flags(fwimg, flags);
	}
	+ if (fbdfw == NULL) {
	+ while ((p = strchr(fwimg, '-')) != NULL)
	+ *p = '_';
	+ fbdfw = firmware_get_flags(fwimg, flags);
	+ }
	free(__DECONST(void *, fwimg), M_LKPI_FW);
	}
	}