ath6kl: add log messages for firmware failure cases. (efc2b2b5) · Commits · 戴 / test

drivers/net/wireless/ath/ath6kl/init.c

+15 −1

Original line number	Diff line number	Diff line
		@@ -954,8 +954,10 @@ static int ath6kl_fetch_fw_apin(struct ath6kl ar, const char name)
		snprintf(filename, sizeof(filename), "%s/%s", ar->hw.fw.dir, name);

		ret = request_firmware(&fw, filename, ar->dev);
		if (ret)
		if (ret) {
		ath6kl_err("Failed request firmware, rv: %d\n", ret);
		return ret;
		}

		data = fw->data;
		len = fw->size;
		@@ -964,11 +966,15 @@ static int ath6kl_fetch_fw_apin(struct ath6kl ar, const char name)
		magic_len = strlen(ATH6KL_FIRMWARE_MAGIC) + 1;

		if (len < magic_len) {
		ath6kl_err("Magic length is invalid, len: %zd magic_len: %zd\n",
		len, magic_len);
		ret = -EINVAL;
		goto out;
		}

		if (memcmp(data, ATH6KL_FIRMWARE_MAGIC, magic_len) != 0) {
		ath6kl_err("Magic is invalid, magic_len: %zd\n",
		magic_len);
		ret = -EINVAL;
		goto out;
		}
		@@ -987,7 +993,12 @@ static int ath6kl_fetch_fw_apin(struct ath6kl ar, const char name)
		len -= sizeof(*hdr);
		data += sizeof(*hdr);

		ath6kl_dbg(ATH6KL_DBG_BOOT, "ie-id: %d len: %zd (0x%zx)\n",
		ie_id, ie_len, ie_len);

		if (len < ie_len) {
		ath6kl_err("IE len is invalid, len: %zd ie_len: %zd ie-id: %d\n",
		len, ie_len, ie_id);
		ret = -EINVAL;
		goto out;
		}
		@@ -1008,6 +1019,7 @@ static int ath6kl_fetch_fw_apin(struct ath6kl ar, const char name)
		ar->fw_otp = kmemdup(data, ie_len, GFP_KERNEL);

		if (ar->fw_otp == NULL) {
		ath6kl_err("fw_otp cannot be allocated\n");
		ret = -ENOMEM;
		goto out;
		}
		@@ -1025,6 +1037,7 @@ static int ath6kl_fetch_fw_apin(struct ath6kl ar, const char name)
		ar->fw = vmalloc(ie_len);

		if (ar->fw == NULL) {
		ath6kl_err("fw storage cannot be allocated, len: %zd\n", ie_len);
		ret = -ENOMEM;
		goto out;
		}
		@@ -1039,6 +1052,7 @@ static int ath6kl_fetch_fw_apin(struct ath6kl ar, const char name)
		ar->fw_patch = kmemdup(data, ie_len, GFP_KERNEL);

		if (ar->fw_patch == NULL) {
		ath6kl_err("fw_patch storage cannot be allocated, len: %zd\n", ie_len);
		ret = -ENOMEM;
		goto out;
		}

Admin message