Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

V4L/DVB: s2255drv: firmware reload on timeout

Browse source 
Signed-off-by: Dean Anderson <linux-dev@sensoray.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Dean Anderson 2010-04-12 15:05:37 -03:00 • committed by Mauro Carvalho Chehab
parent b187913c77
commit eb78deecb4
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/media/video/s2255drv.c
View file

@ -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, \
@ -1755,7 +1755,7 @@ static int s2255_open(struct file *file)
== S2255_FW_SUCCESS) || == S2255_FW_SUCCESS) ||
(atomic_read(&dev->fw_data->fw_state) (atomic_read(&dev->fw_data->fw_state)
== S2255_FW_DISCONNECTING)), == S2255_FW_DISCONNECTING)),
msecs_to_jiffies(S2255_LOAD_TIMEOUT)); msecs_to_jiffies(S2255_LOAD_TIMEOUT));
/* state may have changed, re-read */ /* state may have changed, re-read */
state = atomic_read(&dev->fw_data->fw_state); state = atomic_read(&dev->fw_data->fw_state);
break; break;
@ -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;