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

Commit 22760ed3 authored by Steven Toth's avatar Steven Toth Committed by Mauro Carvalho Chehab
Browse files

[media] saa7164: bugfix, avoid oops when driver unloads without firmware 



Signed-off-by: default avatarSteven Toth <stoth@kernellabs.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent a1c592b7

drivers/media/video/saa7164/saa7164-core.c

+2 −1
Original line number Diff line number Diff line
@@ -1423,6 +1423,7 @@ static void __devexit saa7164_finidev(struct pci_dev *pci_dev) 
			kthread_stop(dev->kthread);

			dev->kthread = NULL;

		}

		if (dev->firmwareloaded)

			saa7164_api_set_debug(dev, 0x00);

	}

drivers/media/video/saa7164/saa7164-fw.c

+1 −0
Original line number Diff line number Diff line
@@ -604,6 +604,7 @@ int saa7164_downloadfirmware(struct saa7164_dev *dev) 
		}

	}



	dev->firmwareloaded = 1;

	ret = 0;



out:

drivers/media/video/saa7164/saa7164.h

+1 −0
Original line number Diff line number Diff line
@@ -452,6 +452,7 @@ struct saa7164_dev { 


	/* firmware status */

	struct saa7164_fw_status	fw_status;

	u32				firmwareloaded;



	tmComResHWDescr_t		hwdesc;

	tmComResInterfaceDescr_t	intfdesc;