From 30124aac970ee325d929c474db7ce476cede1526 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Tue, 9 Oct 2007 22:15:27 -0300 Subject: [PATCH] --- yaml --- r: 65962 b: refs/heads/master c: c3e2a8e64cb2282a406ff6e63f7bd09eb6f61a1d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/zc0301/zc0301_core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fd9e68221932..b6b79547c3a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3abff557d5eed7d6fd03aa11353a1c0f329cac2b +refs/heads/master: c3e2a8e64cb2282a406ff6e63f7bd09eb6f61a1d diff --git a/trunk/drivers/media/video/zc0301/zc0301_core.c b/trunk/drivers/media/video/zc0301/zc0301_core.c index 35138c594be1..08a93c31c0a0 100644 --- a/trunk/drivers/media/video/zc0301/zc0301_core.c +++ b/trunk/drivers/media/video/zc0301/zc0301_core.c @@ -655,7 +655,7 @@ static int zc0301_open(struct inode* inode, struct file* filp) int err = 0; if (!down_read_trylock(&zc0301_dev_lock)) - return -ERESTARTSYS; + return -EAGAIN; cam = video_get_drvdata(video_devdata(filp));