From 7deb93127e8d98ac0fec8559048ec17b185e48aa Mon Sep 17 00:00:00 2001 From: ddl Date: Wed, 17 Sep 2014 11:26:57 +0800 Subject: [PATCH] camsys_drv: v0.0x14.0 --- drivers/media/video/rk_camsys/camsys_drv.c | 2 +- drivers/media/video/rk_camsys/camsys_internal.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/media/video/rk_camsys/camsys_drv.c b/drivers/media/video/rk_camsys/camsys_drv.c index bef95acc8d7a..4f4440c76d23 100755 --- 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 ce71d9faeeb4..30da5fafeba5 100755 --- 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" -- 2.34.1