diff --git a/[refs] b/[refs]
index 3bc876889b37..fd9e68221932 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: acd827d63a568a2cfa26ae8e6093b098c91c631b
+refs/heads/master: 3abff557d5eed7d6fd03aa11353a1c0f329cac2b
diff --git a/trunk/drivers/media/video/w9968cf.c b/trunk/drivers/media/video/w9968cf.c
index 77599f228b61..5a1b5f5a7d46 100644
--- a/trunk/drivers/media/video/w9968cf.c
+++ b/trunk/drivers/media/video/w9968cf.c
@@ -2679,7 +2679,7 @@ static int w9968cf_open(struct inode* inode, struct file* filp)
 
 	/* This the only safe way to prevent race conditions with disconnect */
 	if (!down_read_trylock(&w9968cf_disconnect))
-		return -ERESTARTSYS;
+		return -EAGAIN;
 
 	cam = (struct w9968cf_device*)video_get_drvdata(video_devdata(filp));