---

yaml --- r: 343847 b: refs/heads/master c: 2827a44 h: refs/heads/master i: 343845: 05df023 343843: 9f4cd7b 343839: dcc8595 v: v3
git-mirror · Oct 28, 2012 · 1ef9f16 · 1ef9f16
1 parent 81bf889
commit 1ef9f16
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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,