---

yaml
---
r: 219391
b: refs/heads/master
c: 99b73d3
h: refs/heads/master
i:
  219389: b02a3f8
  219387: df78261
  219383: 4c2f555
  219375: e1693a5
  219359: a2a660a
  219327: dd874bc
  219263: 0add2cd
  219135: 0eda1b0
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1247ff5c0acb0fb50b076e390bb770acc95d1d7e
+refs/heads/master: 99b73d38fa014bcf0f08557cf716907eceffaa1c

trunk/drivers/media/video/saa7164/saa7164-api.c

@@ -26,9 +26,9 @@
 
 int saa7164_api_get_load_info(struct saa7164_dev *dev, tmFwInfoStruct_t *i)
 {
-	int ret, debug;
+	int ret;
 
-	if (!(debug & DBGLVL_CPU))
+	if (!(saa_debug & DBGLVL_CPU))
 		return 0;
 
 	dprintk(DBGLVL_API, "%s()\n", __func__);

trunk/drivers/media/video/saa7164/saa7164-bus.c

@@ -83,7 +83,7 @@ void saa7164_bus_dump(struct saa7164_dev *dev)
 void saa7164_bus_verify(struct saa7164_dev *dev)
 {
 	tmComResBusInfo_t *b = &dev->bus;
-	int bug = 0, debug;
+	int bug = 0;
 
 	if (saa7164_readl(b->m_dwSetReadPos) > b->m_dwSizeSetRing)
 		bug++;
@@ -98,9 +98,9 @@ void saa7164_bus_verify(struct saa7164_dev *dev)
 		bug++;
 
 	if (bug) {
-		debug = 0xffff; /* Ensure we get the bus dump */
+		saa_debug = 0xffff; /* Ensure we get the bus dump */
 		saa7164_bus_dump(dev);
-		debug = 1024; /* Ensure we get the bus dump */
+		saa_debug = 1024; /* Ensure we get the bus dump */
 		BUG();
 	}
 }