Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4497be3b authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "qseecom: use firmware_request_nowarn"

parents 9842b327 d85824ac

drivers/misc/qseecom.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -4378,9 +4378,9 @@ static int __qseecom_get_fw_size(const char *appname, uint32_t *fw_size, 
	int num_images = 0;

	int num_images = 0;





	snprintf(fw_name, sizeof(fw_name), "%s.mdt", appname);

	snprintf(fw_name, sizeof(fw_name), "%s.mdt", appname);

	rc = request_firmware(&fw_entry, fw_name,  qseecom.pdev);

	rc = firmware_request_nowarn(&fw_entry, fw_name,  qseecom.pdev);

	if (rc) {

	if (rc) {

		pr_err("error with request_firmware\n");

		pr_err("error with firmware_request_nowarn, rc = %d\n", rc);

		ret = -EIO;

		ret = -EIO;

		goto err;

		goto err;

	}

	}
@@ -4408,7 +4408,7 @@ static int __qseecom_get_fw_size(const char *appname, uint32_t *fw_size, 
	for (i = 0; i < num_images; i++) {

	for (i = 0; i < num_images; i++) {

		memset(fw_name, 0, sizeof(fw_name));

		memset(fw_name, 0, sizeof(fw_name));

		snprintf(fw_name, ARRAY_SIZE(fw_name), "%s.b%02d", appname, i);

		snprintf(fw_name, ARRAY_SIZE(fw_name), "%s.b%02d", appname, i);

		ret = request_firmware(&fw_entry, fw_name, qseecom.pdev);

		ret = firmware_request_nowarn(&fw_entry, fw_name, qseecom.pdev);

		if (ret)

		if (ret)

			goto err;

			goto err;

		if (*fw_size > U32_MAX - fw_entry->size) {

		if (*fw_size > U32_MAX - fw_entry->size) {
@@ -4444,7 +4444,7 @@ static int __qseecom_get_fw_data(const char *appname, u8 *img_data, 
	unsigned char app_arch = 0;

	unsigned char app_arch = 0;





	snprintf(fw_name, sizeof(fw_name), "%s.mdt", appname);

	snprintf(fw_name, sizeof(fw_name), "%s.mdt", appname);

	rc = request_firmware(&fw_entry, fw_name,  qseecom.pdev);

	rc = firmware_request_nowarn(&fw_entry, fw_name,  qseecom.pdev);

	if (rc) {

	if (rc) {

		ret = -EIO;

		ret = -EIO;

		goto err;

		goto err;
@@ -4478,7 +4478,7 @@ static int __qseecom_get_fw_data(const char *appname, u8 *img_data, 
	fw_entry = NULL;

	fw_entry = NULL;

	for (i = 0; i < num_images; i++) {

	for (i = 0; i < num_images; i++) {

		snprintf(fw_name, ARRAY_SIZE(fw_name), "%s.b%02d", appname, i);

		snprintf(fw_name, ARRAY_SIZE(fw_name), "%s.b%02d", appname, i);

		ret = request_firmware(&fw_entry, fw_name,  qseecom.pdev);

		ret = firmware_request_nowarn(&fw_entry, fw_name, qseecom.pdev);

		if (ret) {

		if (ret) {

			pr_err("Failed to locate blob %s\n", fw_name);

			pr_err("Failed to locate blob %s\n", fw_name);

			goto err;

			goto err;