camsys_drv: v0.0x14.0

diff --git a/drivers/media/video/rk_camsys/camsys_drv.c b/drivers/media/video/rk_camsys/camsys_drv.c
index bef95acc8d7a4d4c51fc630231a2b7149e0bcfcb..4f4440c76d23321553b22637d4d022b8892cd9e0 100755 (executable)
--- a/drivers/media/video/rk_camsys/camsys_drv.c
+++ b/drivers/media/video/rk_camsys/camsys_drv.c
@@ -167,7 +167,7 @@ static int camsys_extdev_register(camsys_devio_name_t *devio, camsys_dev_t *cams
 
     extdev = camsys_find_extdev(devio->dev_id, camsys_dev);
     if (extdev != NULL) {
-        err = -EINVAL;    /* ddl@rock-chips.com: v0.0x13.0 */
+        err = -EBUSY;    /* ddl@rock-chips.com: v0.0x13.0 */
         camsys_warn("Extdev(dev_id: 0x%x) has been registered in %s!",
             devio->dev_id, dev_name(camsys_dev->miscdev.this_device));
         goto end;

diff --git a/drivers/media/video/rk_camsys/camsys_internal.h b/drivers/media/video/rk_camsys/camsys_internal.h
index ce71d9faeeb4a6c9bc3dba5d2904bd5b18c1958f..30da5fafeba56a968bb1512872f3fa6f16d66145 100755 (executable)
--- a/drivers/media/video/rk_camsys/camsys_internal.h
+++ b/drivers/media/video/rk_camsys/camsys_internal.h
@@ -95,8 +95,10 @@
 *v0.0x13.0:
          1) camsys_extdev_register return failed when this dev_id has been registered;
          2) add support JPG irq connect;
+*v0.0x14.0:
+         1) camsys_extdev_register return -EBUSY when this dev_id has been registered;
 */
-#define CAMSYS_DRIVER_VERSION                   KERNEL_VERSION(0,0x13,0)
+#define CAMSYS_DRIVER_VERSION                   KERNEL_VERSION(0,0x14,0)
 
 
 #define CAMSYS_PLATFORM_DRV_NAME                "RockChip-CamSys"