diff options
author | Dan Carpenter <error27@gmail.com> | 2010-05-26 10:58:10 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-06-01 00:24:17 -0400 |
commit | 129c34d8fce443d1c43d32637abbab8433504497 (patch) | |
tree | 3e71bcc5368ba941e2640d7e006c32a242283650 | |
parent | f0e5481f2f5304ffebd43d97bd5118443fac8d23 (diff) |
V4L/DVB: video/saa7134: change dprintk() to i2cdprintk()
The problem is that dprintk() dereferences "dev" which is null here.
The i2cdprintk() uses "ir" so that's OK.
Also Jean Delvare pointed out a typo in the comment so we may as well
fix that.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/video/saa7134/saa7134-input.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c index c1240d22028a..0b336ca6d55b 100644 --- a/drivers/media/video/saa7134/saa7134-input.c +++ b/drivers/media/video/saa7134/saa7134-input.c | |||
@@ -141,8 +141,8 @@ static int get_key_flydvb_trio(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw) | |||
141 | struct saa7134_dev *dev = ir->c->adapter->algo_data; | 141 | struct saa7134_dev *dev = ir->c->adapter->algo_data; |
142 | 142 | ||
143 | if (dev == NULL) { | 143 | if (dev == NULL) { |
144 | dprintk("get_key_flydvb_trio: " | 144 | i2cdprintk("get_key_flydvb_trio: " |
145 | "gir->c->adapter->algo_data is NULL!\n"); | 145 | "ir->c->adapter->algo_data is NULL!\n"); |
146 | return -EIO; | 146 | return -EIO; |
147 | } | 147 | } |
148 | 148 | ||
@@ -195,8 +195,8 @@ static int get_key_msi_tvanywhere_plus(struct IR_i2c *ir, u32 *ir_key, | |||
195 | /* <dev> is needed to access GPIO. Used by the saa_readl macro. */ | 195 | /* <dev> is needed to access GPIO. Used by the saa_readl macro. */ |
196 | struct saa7134_dev *dev = ir->c->adapter->algo_data; | 196 | struct saa7134_dev *dev = ir->c->adapter->algo_data; |
197 | if (dev == NULL) { | 197 | if (dev == NULL) { |
198 | dprintk("get_key_msi_tvanywhere_plus: " | 198 | i2cdprintk("get_key_msi_tvanywhere_plus: " |
199 | "gir->c->adapter->algo_data is NULL!\n"); | 199 | "ir->c->adapter->algo_data is NULL!\n"); |
200 | return -EIO; | 200 | return -EIO; |
201 | } | 201 | } |
202 | 202 | ||