leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] cx231xx: fix undefined function cx231xx_g_chip_ident()

Browse Source 
This patch:
http://git.linuxtv.org/media_tree.git/commit/b86d15440b683f8634c0cb26fc0861a5bc4913ac
is missing a chunk when compared to an older version:
https://patchwork.kernel.org/patch/2063281/
probably because of an unresolved merging conflict.
This causes the following error:
WARNING: "cx231xx_g_chip_ident" [/home/jena/media_build/v4l/cx231xx.ko] undefined!

Signed-off-by: Gianluca Gennari <gennarone@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Gianluca Gennari 2013-03-07 12:19:29 -03:00 committed by Mauro Carvalho Chehab
parent 457ba4ce4f
commit 9bb05696af
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/usb/cx231xx/cx231xx-video.c
View File

@ -1227,7 +1227,7 @@ int cx231xx_s_frequency(struct file *file, void *priv,
return rc;
}
int vidioc_g_chip_ident(struct file *file, void *fh,
int cx231xx_g_chip_ident(struct file *file, void *fh,
struct v4l2_dbg_chip_ident *chip)
{
chip->ident = V4L2_IDENT_NONE;