[media] saa7164: change debug to saa_debug

Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/saa7164/saa7164-api.c b/drivers/media/video/saa7164/saa7164-api.c
index 0a2fdcde2f96ac68c35c00b72fb8adebdc850552..d05ba28cab2a4a2a8ada68ded8ff3ab70643f01b 100644 (file)
--- a/drivers/media/video/saa7164/saa7164-api.c
+++ b/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__);

diff --git a/drivers/media/video/saa7164/saa7164-bus.c b/drivers/media/video/saa7164/saa7164-bus.c
index 8848687bf9d560f797d25ac83dab02dd1af40ec8..0e76538cabb093ac55b494144fac7fe8385ca3f5 100644 (file)
--- a/drivers/media/video/saa7164/saa7164-bus.c
+++ b/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();
        }
 }