diff --git a/[refs] b/[refs]
index f5b97c2ef34a..91f4b5c355ae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97b5519b08086eec02f2241b6764d73f997014c9
+refs/heads/master: c888d4e7b2644c7ff17098b0b521c29b98e0abd0
diff --git a/trunk/drivers/staging/cpia/cpia.c b/trunk/drivers/staging/cpia/cpia.c
index 933ae4c8cb9a..0e740b8dafc3 100644
--- a/trunk/drivers/staging/cpia/cpia.c
+++ b/trunk/drivers/staging/cpia/cpia.c
@@ -3184,13 +3184,9 @@ static int cpia_open(struct file *file)
 		goto oops;
 	}
 
-	err = -EINTR;
-	if(signal_pending(current))
-		goto oops;
-
 	/* Set ownership of /proc/cpia/videoX to current user */
 	if(cam->proc_entry)
-		cam->proc_entry->uid = current_uid();
+		cam->proc_entry->uid = current_euid();
 
 	/* set mark for loading first frame uncompressed */
 	cam->first_frame = 1;