Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bb05696 authored by Gianluca Gennari's avatar Gianluca Gennari Committed by Mauro Carvalho Chehab
Browse files

[media] cx231xx: fix undefined function cx231xx_g_chip_ident() 

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: default avatarGianluca Gennari <gennarone@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 457ba4ce

drivers/media/usb/cx231xx/cx231xx-video.c

+1 −1
Original line number Diff line number Diff line
@@ -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;