Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6-omap-h63xx.git] / drivers / media / video / zc0301 / zc0301_core.c

diff --git a/drivers/media/video/zc0301/zc0301_core.c b/drivers/media/video/zc0301/zc0301_core.c
index 35138c594be1b7486e7477058d42d84609824cd7..08a93c31c0a0e6e542a8a149769d076d577bdbfe 100644 (file)
--- a/drivers/media/video/zc0301/zc0301_core.c
+++ b/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));