V4L/DVB: s2255drv: firmware reload on timeout (eb78deec) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/media/video/s2255drv.c

+14 −4

Original line number	Original line	Diff line number	Diff line
	@@ -58,7 +58,7 @@
	#include <linux/usb.h>		#include <linux/usb.h>

	#define S2255_MAJOR_VERSION 1		#define S2255_MAJOR_VERSION 1
	#define S2255_MINOR_VERSION 19		#define S2255_MINOR_VERSION 20
	#define S2255_RELEASE 0		#define S2255_RELEASE 0
	#define S2255_VERSION KERNEL_VERSION(S2255_MAJOR_VERSION, \		#define S2255_VERSION KERNEL_VERSION(S2255_MAJOR_VERSION, \
	S2255_MINOR_VERSION, \		S2255_MINOR_VERSION, \
	@@ -1763,27 +1763,38 @@ static int s2255_open(struct file *file)
	default:		default:
	break;		break;
	}		}
	mutex_unlock(&dev->open_lock);
	/* state may have changed in above switch statement */		/* state may have changed in above switch statement */
	switch (state) {		switch (state) {
	case S2255_FW_SUCCESS:		case S2255_FW_SUCCESS:
	break;		break;
	case S2255_FW_FAILED:		case S2255_FW_FAILED:
	printk(KERN_INFO "2255 firmware load failed.\n");		printk(KERN_INFO "2255 firmware load failed.\n");
			mutex_unlock(&dev->open_lock);
	return -ENODEV;		return -ENODEV;
	case S2255_FW_DISCONNECTING:		case S2255_FW_DISCONNECTING:
	printk(KERN_INFO "%s: disconnecting\n", __func__);		printk(KERN_INFO "%s: disconnecting\n", __func__);
			mutex_unlock(&dev->open_lock);
	return -ENODEV;		return -ENODEV;
	case S2255_FW_LOADED_DSPWAIT:		case S2255_FW_LOADED_DSPWAIT:
	case S2255_FW_NOTLOADED:		case S2255_FW_NOTLOADED:
	printk(KERN_INFO "%s: firmware not loaded yet"		printk(KERN_INFO "%s: firmware not loaded yet"
	"please try again later\n",		"please try again later\n",
	__func__);		__func__);
			/*
			* Timeout on firmware load means device unusable.
			* Set firmware failure state.
			* On next s2255_open the firmware will be reloaded.
			*/
			atomic_set(&dev->fw_data->fw_state,
			S2255_FW_FAILED);
			mutex_unlock(&dev->open_lock);
	return -EAGAIN;		return -EAGAIN;
	default:		default:
	printk(KERN_INFO "%s: unknown state\n", __func__);		printk(KERN_INFO "%s: unknown state\n", __func__);
			mutex_unlock(&dev->open_lock);
	return -EFAULT;		return -EFAULT;
	}		}
			mutex_unlock(&dev->open_lock);
	/* allocate + initialize per filehandle data */		/* allocate + initialize per filehandle data */
	fh = kzalloc(sizeof(*fh), GFP_KERNEL);		fh = kzalloc(sizeof(*fh), GFP_KERNEL);
	if (NULL == fh)		if (NULL == fh)
	@@ -2074,7 +2085,6 @@ static int save_frame(struct s2255_dev dev, struct s2255_pipeinfo pipe_info)
	dprintk(5, "setmode ready %d\n", cc);		dprintk(5, "setmode ready %d\n", cc);
	break;		break;
	case S2255_RESPONSE_FW:		case S2255_RESPONSE_FW:

	dev->chn_ready \|= (1 << cc);		dev->chn_ready \|= (1 << cc);
	if ((dev->chn_ready & 0x0f) != 0x0f)		if ((dev->chn_ready & 0x0f) != 0x0f)
	break;		break;