diff --git a/[refs] b/[refs]
index 9b0077f55b1b..fb5f57060b0b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c56b04af67211c4311dd9961ce5aba86b96ba9c
+refs/heads/master: abc94fc8feb1488079dd7dd46bd61d37d91c5658
diff --git a/trunk/drivers/media/video/cpia.c b/trunk/drivers/media/video/cpia.c
index b14c59c281eb..c325e926de8a 100644
--- a/trunk/drivers/media/video/cpia.c
+++ b/trunk/drivers/media/video/cpia.c
@@ -3202,7 +3202,7 @@ static int cpia_open(struct inode *inode, struct file *file)
 
 	/* Set ownership of /proc/cpia/videoX to current user */
 	if(cam->proc_entry)
-		cam->proc_entry->uid = current->uid;
+		cam->proc_entry->uid = current_uid();
 
 	/* set mark for loading first frame uncompressed */
 	cam->first_frame = 1;