aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorSteven Toth <stoth@kernellabs.com>2010-07-31 15:24:25 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-21 05:55:16 -0400
commit99b73d38fa014bcf0f08557cf716907eceffaa1c (patch)
treea0fc4e4c47765e0d1f2f195ea2f5d1cb5f60d9d7 /drivers/media
parent1247ff5c0acb0fb50b076e390bb770acc95d1d7e (diff)
[media] saa7164: change debug to saa_debug
Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/saa7164/saa7164-api.c4
-rw-r--r--drivers/media/video/saa7164/saa7164-bus.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/video/saa7164/saa7164-api.c b/drivers/media/video/saa7164/saa7164-api.c
index 0a2fdcde2f96..d05ba28cab2a 100644
--- a/drivers/media/video/saa7164/saa7164-api.c
+++ b/drivers/media/video/saa7164/saa7164-api.c
@@ -26,9 +26,9 @@
26 26
27int saa7164_api_get_load_info(struct saa7164_dev *dev, tmFwInfoStruct_t *i) 27int saa7164_api_get_load_info(struct saa7164_dev *dev, tmFwInfoStruct_t *i)
28{ 28{
29 int ret, debug; 29 int ret;
30 30
31 if (!(debug & DBGLVL_CPU)) 31 if (!(saa_debug & DBGLVL_CPU))
32 return 0; 32 return 0;
33 33
34 dprintk(DBGLVL_API, "%s()\n", __func__); 34 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 8848687bf9d5..0e76538cabb0 100644
--- 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)
83void saa7164_bus_verify(struct saa7164_dev *dev) 83void saa7164_bus_verify(struct saa7164_dev *dev)
84{ 84{
85 tmComResBusInfo_t *b = &dev->bus; 85 tmComResBusInfo_t *b = &dev->bus;
86 int bug = 0, debug; 86 int bug = 0;
87 87
88 if (saa7164_readl(b->m_dwSetReadPos) > b->m_dwSizeSetRing) 88 if (saa7164_readl(b->m_dwSetReadPos) > b->m_dwSizeSetRing)
89 bug++; 89 bug++;
@@ -98,9 +98,9 @@ void saa7164_bus_verify(struct saa7164_dev *dev)
98 bug++; 98 bug++;
99 99
100 if (bug) { 100 if (bug) {
101 debug = 0xffff; /* Ensure we get the bus dump */ 101 saa_debug = 0xffff; /* Ensure we get the bus dump */
102 saa7164_bus_dump(dev); 102 saa7164_bus_dump(dev);
103 debug = 1024; /* Ensure we get the bus dump */ 103 saa_debug = 1024; /* Ensure we get the bus dump */
104 BUG(); 104 BUG();
105 } 105 }
106} 106}