1 files changed, 3 insertions, 13 deletions

diff --git a/drivers/media/platform/soc_camera/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c
index 82dbf99d347c..1abbb36d0755 100644
--- a/drivers/media/platform/soc_camera/atmel-isi.c
+++ b/drivers/media/platform/soc_camera/atmel-isi.c
@@ -514,6 +514,7 @@ static int isi_camera_init_videobuf(struct vb2_queue *q,
         q->buf_struct_size = sizeof(struct frame_buffer);
         q->ops = &isi_video_qops;
         q->mem_ops = &vb2_dma_contig_memops;
+        q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
 
         return vb2_queue_init(q);
 }
@@ -1020,7 +1021,7 @@ static int atmel_isi_probe(struct platform_device *pdev)
         isi_writel(isi, ISI_CTRL, ISI_CTRL_DIS);
 
         irq = platform_get_irq(pdev, 0);
-        if (irq < 0) {
+        if (IS_ERR_VALUE(irq)) {
                 ret = irq;
                 goto err_req_irq;
         }
@@ -1073,7 +1074,6 @@ err_clk_prepare_pclk:
 }
 
 static struct platform_driver atmel_isi_driver = {
-        .probe          = atmel_isi_probe,
         .remove         = atmel_isi_remove,
         .driver         = {
                 .name = "atmel_isi",
@@ -1081,17 +1081,7 @@ static struct platform_driver atmel_isi_driver = {
         },
 };
 
-static int __init atmel_isi_init_module(void)
-{
-        return  platform_driver_probe(&atmel_isi_driver, &atmel_isi_probe);
-}
-
-static void __exit atmel_isi_exit(void)
-{
-        platform_driver_unregister(&atmel_isi_driver);
-}
-module_init(atmel_isi_init_module);
-module_exit(atmel_isi_exit);
+module_platform_driver_probe(atmel_isi_driver, atmel_isi_probe);
 
 MODULE_AUTHOR("Josh Wu <josh.wu@atmel.com>");
 MODULE_DESCRIPTION("The V4L2 driver for Atmel Linux");