Commit 1e9b71d5 authored by Philipp Zabel's avatar Philipp Zabel Committed by Mauro Carvalho Chehab
Browse files

[media] coda: restore original firmware locations 



Recently, an unfinished patch was merged that added a third entry to the
beginning of the array of firmware locations without changing the code
to also look at the third element, thus pushing an old firmware location
off the list.

Fixes: 8af7779f ("[media] coda: add Freescale firmware compatibility location")

Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Acked-by: default avatarBaruch Siach <baruch@tkos.co.il>
Reviewed-by: default avatarFabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 69122271

drivers/media/platform/coda/coda-common.c

+13 −8
Original line number Diff line number Diff line
@@ -2205,7 +2205,12 @@ static void coda_fw_callback(const struct firmware *fw, void *context); 


static int coda_firmware_request(struct coda_dev *dev)

{

	char *fw = dev->devtype->firmware[dev->firmware];

	char *fw;



	if (dev->firmware >= ARRAY_SIZE(dev->devtype->firmware))

		return -EINVAL;



	fw = dev->devtype->firmware[dev->firmware];



	dev_dbg(&dev->plat_dev->dev, "requesting firmware '%s' for %s\n", fw,

		coda_product_name(dev->devtype->product));
@@ -2221,16 +2226,16 @@ static void coda_fw_callback(const struct firmware *fw, void *context) 
	struct platform_device *pdev = dev->plat_dev;

	int i, ret;



	if (!fw && dev->firmware == 1) {

	if (!fw) {

		dev->firmware++;

		ret = coda_firmware_request(dev);

		if (ret < 0) {

			v4l2_err(&dev->v4l2_dev, "firmware request failed\n");

			goto put_pm;

		}

	if (!fw) {

		dev->firmware = 1;

		coda_firmware_request(dev);

		return;

	}

	if (dev->firmware == 1) {

	if (dev->firmware > 0) {

		/*

		 * Since we can't suppress warnings for failed asynchronous

		 * firmware requests, report that the fallback firmware was