Hi Dan, On Tue, 25 May 2010 11:19:53 +0200, Dan Carpenter wrote: > The problem is that dprintk() dereferences "dev" which is null here. > The i2cdprintk() uses "ir" so that's OK. > > Signed-off-by: Dan Carpenter <error27@xxxxxxxxx> > --- > v2: Jean Delvare suggested that I use i2cdprintk() instead of modifying > dprintk(). > v3: V2 had a bonus cleanup that I removed from v3 > > diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c > index e5565e2..7691bf2 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) > struct saa7134_dev *dev = ir->c->adapter->algo_data; > > if (dev == NULL) { > - dprintk("get_key_flydvb_trio: " > - "gir->c->adapter->algo_data is NULL!\n"); > + i2cdprintk("get_key_flydvb_trio: " > + "gir->c->adapter->algo_data is NULL!\n"); Sorry for noticing only now, but "gir->" in the comment is odd. As seen in the code above, it's actually "ir->". Maybe you want to fix this, as you are already touching that line anyway. Other than this, this patch is: Acked-by: Jean Delvare <khali@xxxxxxxxxxxx> > return -EIO; > } > > @@ -195,8 +195,8 @@ static int get_key_msi_tvanywhere_plus(struct IR_i2c *ir, u32 *ir_key, > /* <dev> is needed to access GPIO. Used by the saa_readl macro. */ > struct saa7134_dev *dev = ir->c->adapter->algo_data; > if (dev == NULL) { > - dprintk("get_key_msi_tvanywhere_plus: " > - "gir->c->adapter->algo_data is NULL!\n"); > + i2cdprintk("get_key_msi_tvanywhere_plus: " > + "gir->c->adapter->algo_data is NULL!\n"); > return -EIO; > } > > -- Jean Delvare -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html