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

Commit cbf03140 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: kgsl: Do not cause a fatal error on request firmware failure"

parents e7be7cb7 7e700a3d

drivers/gpu/msm/adreno_a3xx.c

+1 −1
Original line number Diff line number Diff line
@@ -1480,7 +1480,7 @@ static int _load_firmware(struct kgsl_device *device, const char *fwfile, 
	ret = request_firmware(&fw, fwfile, device->dev);



	if (ret) {

		KGSL_DRV_FATAL(device, "request_firmware(%s) failed: %d\n",

		KGSL_DRV_ERR(device, "request_firmware(%s) failed: %d\n",

			     fwfile, ret);

		return ret;

	}

drivers/gpu/msm/adreno_a5xx.c

+1 −1
Original line number Diff line number Diff line
@@ -1495,7 +1495,7 @@ static int _load_firmware(struct adreno_device *adreno_dev, const char *fwfile, 
	ret = request_firmware(&fw, fwfile, device->dev);



	if (ret) {

		KGSL_DRV_FATAL(device, "request_firmware(%s) failed: %d\n",

		KGSL_DRV_ERR(device, "request_firmware(%s) failed: %d\n",

				fwfile, ret);

		return ret;

	}