From e33476d1514c67b0411c6fedb42af9396941ff55 Mon Sep 17 00:00:00 2001 From: Trent Piepho Date: Mon, 23 Jul 2007 06:58:31 -0300 Subject: [PATCH] --- yaml --- r: 63179 b: refs/heads/master c: bc147135bc410bdd9da684646af75a188d882d56 h: refs/heads/master i: 63177: 1608bea2b6a5c2bb373e9d5d58a27b2fdd4f7afe 63175: af9e9ade9556656ec866015e2018f320633424c3 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/usbvision/usbvision-video.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 86011566b040..b3cc7bc41e95 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cf784d554fdb94f21671830135dba56b507126cf +refs/heads/master: bc147135bc410bdd9da684646af75a188d882d56 diff --git a/trunk/drivers/media/video/usbvision/usbvision-video.c b/trunk/drivers/media/video/usbvision/usbvision-video.c index 868b6886fe7f..e3371f972240 100644 --- a/trunk/drivers/media/video/usbvision/usbvision-video.c +++ b/trunk/drivers/media/video/usbvision/usbvision-video.c @@ -517,6 +517,7 @@ static int vidioc_g_register (struct file *file, void *priv, __FUNCTION__, errCode); return errCode; } + reg->val = errCode; return 0; } @@ -531,8 +532,8 @@ static int vidioc_s_register (struct file *file, void *priv, if (!v4l2_chip_match_host(reg->match_type, reg->match_chip)) return -EINVAL; /* NT100x has a 8-bit register space */ - reg->val = (u8)usbvision_write_reg(usbvision, reg->reg&0xff, reg->val); - if (reg->val < 0) { + errCode = usbvision_write_reg(usbvision, reg->reg&0xff, reg->val); + if (errCode < 0) { err("%s: VIDIOC_DBG_S_REGISTER failed: error %d", __FUNCTION__, errCode); return errCode;