From 1ef9f162cb167d869f5891d8b47d1f6985e893c7 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 27 Oct 2012 16:17:39 -0300 Subject: [PATCH] --- yaml --- r: 343847 b: refs/heads/master c: 2827a4400a181437a2a3e0ccc2307f90bd204fdd h: refs/heads/master i: 343845: 05df0231a64ec11d15e0570fe14097dfa7ead32d 343843: 9f4cd7b3879b993d3d2cb16d4c61f6eb917ca77e 343839: dcc8595df5bc7dc1d45a0850c6cee1da50c60345 v: v3 --- [refs] | 2 +- trunk/drivers/media/pci/ngene/ngene-cards.c | 4 +++- trunk/drivers/media/pci/ngene/ngene-core.c | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b12cad7ddee4..68ef82c2c2e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba4008921ba8144ff307f10d04fe52e6d6e744dc +refs/heads/master: 2827a4400a181437a2a3e0ccc2307f90bd204fdd diff --git a/trunk/drivers/media/pci/ngene/ngene-cards.c b/trunk/drivers/media/pci/ngene/ngene-cards.c index 96a13ed197d0..b38bce529566 100644 --- a/trunk/drivers/media/pci/ngene/ngene-cards.c +++ b/trunk/drivers/media/pci/ngene/ngene-cards.c @@ -425,8 +425,10 @@ static int ReadEEProm(struct i2c_adapter *adapter, status = i2c_read_eeprom(adapter, 0x50, Addr, data, Length); if (!status) { *pLength = EETag[2]; +#if 0 if (Length < EETag[2]) - ; /*status=STATUS_BUFFER_OVERFLOW; */ + status = STATUS_BUFFER_OVERFLOW; +#endif } } return status; diff --git a/trunk/drivers/media/pci/ngene/ngene-core.c b/trunk/drivers/media/pci/ngene/ngene-core.c index c8e0d5b99d4c..2c2df88b4a9c 100644 --- a/trunk/drivers/media/pci/ngene/ngene-core.c +++ b/trunk/drivers/media/pci/ngene/ngene-core.c @@ -752,8 +752,8 @@ void set_transfer(struct ngene_channel *chan, int state) if (chan->mode & NGENE_IO_TSIN) chan->pBufferExchange = tsin_exchange; spin_unlock_irq(&chan->state_lock); - } else - ;/* printk(KERN_INFO DEVICE_NAME ": lock=%08x\n", + } + /* else printk(KERN_INFO DEVICE_NAME ": lock=%08x\n", ngreadl(0x9310)); */ ret = ngene_command_stream_control(dev, chan->number,