Hi, Guennadi Would you acknowledge these two v3 patches and queue them for 3.3 merge window? Thanks. Best Regards, Josh Wu On Thursday, December 08, 2011 6:19 PM, Josh Wu wrote: > Signed-off-by: Josh Wu <josh.wu@xxxxxxxxx> > --- > in v2 version, made the label name to be consistent > drivers/media/video/atmel-isi.c | 15 +++++++++++++++ > 1 files changed, 15 insertions(+), 0 deletions(-) > diff --git a/drivers/media/video/atmel-isi.c b/drivers/media/video/atmel-isi.c > index ea4eef4..91ebcfb 100644 > --- a/drivers/media/video/atmel-isi.c > +++ b/drivers/media/video/atmel-isi.c > @@ -922,7 +922,9 @@ static int __devexit atmel_isi_remove(struct platform_device *pdev) > isi->fb_descriptors_phys); > iounmap(isi->regs); > + clk_unprepare(isi->mck); > clk_put(isi->mck); > + clk_unprepare(isi->pclk); > clk_put(isi->pclk); > kfree(isi); > @@ -955,6 +957,12 @@ static int __devinit atmel_isi_probe(struct platform_device *pdev) > if (IS_ERR(pclk)) > return PTR_ERR(pclk); > + ret = clk_prepare(pclk); > + if (ret) { > + clk_put(pclk); > + return ret; > + } > + > isi = kzalloc(sizeof(struct atmel_isi), GFP_KERNEL); > if (!isi) { > ret = -ENOMEM; > @@ -978,6 +986,10 @@ static int __devinit atmel_isi_probe(struct platform_device *pdev) > goto err_clk_get; > } > > + ret = clk_prepare(isi->mck); > + if (ret) > + goto err_clk_prepare_mck; > + > /* Set ISI_MCK's frequency, it should be faster than pixel clock */ > ret = clk_set_rate(isi->mck, pdata->mck_hz); > if (ret < 0) > @@ -1059,10 +1071,13 @@ err_alloc_ctx: > isi->fb_descriptors_phys); > err_alloc_descriptors: > err_set_mck_rate: > + clk_unprepare(isi->mck); > +err_clk_prepare_mck: > clk_put(isi->mck); > err_clk_get: > kfree(isi); > err_alloc_isi: > + clk_unprepare(pclk); > clk_put(pclk); > > return ret; > -- > 1.6.3.3 -- 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