From 59cb30bc0847335ee0e5a1560f246a4e4fa68446 Mon Sep 17 00:00:00 2001 From: Steven Toth Date: Sat, 31 Jul 2010 16:24:25 -0300 Subject: [PATCH] --- yaml --- r: 219391 b: refs/heads/master c: 99b73d38fa014bcf0f08557cf716907eceffaa1c h: refs/heads/master i: 219389: b02a3f8c6e8193eabc3bfb1d999053e255ded4c4 219387: df78261c5c6f8fd75b0e0c51ef147caea885a970 219383: 4c2f555edc8c96d3305c6a992611f9f3de4f9bdc 219375: e1693a58a0bff3362a04a2375e714a7d50317979 219359: a2a660ae87b647e6bc555843e778570d8b520a32 219327: dd874bc383944ecd3900e644da34782452b94e5f 219263: 0add2cd36b73c5f2674775b0775720f1b158ddb7 219135: 0eda1b00caf478aa3cb52937339783f06171e750 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/saa7164/saa7164-api.c | 4 ++-- trunk/drivers/media/video/saa7164/saa7164-bus.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 24f051c65612..3b7c7171e2a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1247ff5c0acb0fb50b076e390bb770acc95d1d7e +refs/heads/master: 99b73d38fa014bcf0f08557cf716907eceffaa1c diff --git a/trunk/drivers/media/video/saa7164/saa7164-api.c b/trunk/drivers/media/video/saa7164/saa7164-api.c index 0a2fdcde2f96..d05ba28cab2a 100644 --- a/trunk/drivers/media/video/saa7164/saa7164-api.c +++ b/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__); diff --git a/trunk/drivers/media/video/saa7164/saa7164-bus.c b/trunk/drivers/media/video/saa7164/saa7164-bus.c index 8848687bf9d5..0e76538cabb0 100644 --- a/trunk/drivers/media/video/saa7164/saa7164-bus.c +++ b/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(); } }