diff options
| author | Steven Toth <stoth@kernellabs.com> | 2010-07-31 23:24:25 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 13:55:16 +0400 |
| commit | 99b73d38fa014bcf0f08557cf716907eceffaa1c (patch) | |
| tree | a0fc4e4c47765e0d1f2f195ea2f5d1cb5f60d9d7 | |
| parent | 1247ff5c0acb0fb50b076e390bb770acc95d1d7e (diff) | |
| download | linux-99b73d38fa014bcf0f08557cf716907eceffaa1c.tar.xz | |
[media] saa7164: change debug to saa_debug
Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/video/saa7164/saa7164-api.c | 4 | ||||
| -rw-r--r-- | drivers/media/video/saa7164/saa7164-bus.c | 6 |
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 @@ 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 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) 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(); } } |