On 04/28/2015 05:43 PM, Mauro Carvalho Chehab wrote: > As reported by smatch: > drivers/media/pci/zoran/zoran_device.c:1594 zoran_init_hardware() warn: inconsistent indenting > > Fix indent. While here, fix CodingStyle and remove dead code, as it > can always be recovered from git logs. > > Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxx> Acked-by: Hans Verkuil <hans.verkuil@xxxxxxxxx> > > diff --git a/drivers/media/pci/zoran/zoran_device.c b/drivers/media/pci/zoran/zoran_device.c > index b6801e035ea4..40119b3c52c1 100644 > --- a/drivers/media/pci/zoran/zoran_device.c > +++ b/drivers/media/pci/zoran/zoran_device.c > @@ -1584,14 +1584,11 @@ zoran_init_hardware (struct zoran *zr) > jpeg_codec_sleep(zr, 1); > jpeg_codec_sleep(zr, 0); > > - /* set individual interrupt enables (without GIRQ1) > - * but don't global enable until zoran_open() */ > - > - //btwrite(IRQ_MASK & ~ZR36057_ISR_GIRQ1, ZR36057_ICR); // SW > - // It looks like using only JPEGRepIRQEn is not always reliable, > - // may be when JPEG codec crashes it won't generate IRQ? So, > - /*CP*/ // btwrite(IRQ_MASK, ZR36057_ICR); // Enable Vsync interrupts too. SM WHY ? LP > - zr36057_init_vfe(zr); > + /* > + * set individual interrupt enables (without GIRQ1) > + * but don't global enable until zoran_open() > + */ > + zr36057_init_vfe(zr); > > zr36057_enable_jpg(zr, BUZ_MODE_IDLE); > > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
