shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

camera: rk_cam_cif:v0.3.0x12

Browse Source
This commit is contained in:
oyyf
2013-09-05 16:29:08 +08:00
parent 7e679aad78
commit ce71603421
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/video/rk30_camera_oneframe.c
View File

@@ -327,10 +327,13 @@ module_param(debug, int, S_IRUGO|S_IWUSR);
* 1. fix vb struct may be used again which have been free after stream off, some code modify in soc_camera.c,
* version is v0.1.1;
* 1. fix cif clk out can't be turn off;
*
*v0.3.0x12:
* 1. modify cif irq ,remove judge reg_lastpixel==host_width.
*
*/
#define RK_CAM_VERSION_CODE KERNEL_VERSION(0, 3, 0x11)
#define RK_CAM_VERSION_CODE KERNEL_VERSION(0, 3, 0x12)
static int version = RK_CAM_VERSION_CODE;
module_param(version, int, S_IRUGO);
@@ -1342,7 +1345,7 @@ static inline irqreturn_t rk_camera_cifirq(int irq, void *data)
reg_lastline = read_cif_reg(pcdev->base,CIF_CIF_LAST_LINE);
pcdev->irqinfo.cifirq_idx++;
if ((reg_lastline != pcdev->host_height) || (reg_lastpix != pcdev->host_width)) {
if ((reg_lastline != pcdev->host_height) /*|| (reg_lastpix != pcdev->host_width)*/) {
pcdev->irqinfo.cifirq_abnormal_idx = pcdev->irqinfo.cifirq_idx;
RKCAMERA_DG2("Cif irq-%ld is error, %dx%d != %dx%d\n",pcdev->irqinfo.cifirq_abnormal_idx,
reg_lastpix,reg_lastline,pcdev->host_width,pcdev->host_height);