[media] cx231xx: fix undefined function cx231xx_g_chip_ident()
authorGianluca Gennari <gennarone@gmail.com>
Thu, 7 Mar 2013 15:19:29 +0000 (12:19 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 14 Mar 2013 12:45:55 +0000 (09:45 -0300)
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>
drivers/media/usb/cx231xx/cx231xx-video.c

index 41c5c99..ac62008 100644 (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;