From e4672a5962618331a645c1aea45ec9ee73037f15 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Fri, 7 Aug 2009 19:24:00 +0100 Subject: [PATCH] --- yaml --- r: 162373 b: refs/heads/master c: 7913c21a25a9d54b093bed3522d35b188aadf6a4 h: refs/heads/master i: 162371: f64317dc217e1d1b70585c20a4760b45f76ebd29 v: v3 --- [refs] | 2 +- trunk/drivers/staging/sep/sep_driver.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 522c82a9229d..dd5c516c241e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a18d7b5f36f3c77a239ee752c4ce1197af7b617 +refs/heads/master: 7913c21a25a9d54b093bed3522d35b188aadf6a4 diff --git a/trunk/drivers/staging/sep/sep_driver.c b/trunk/drivers/staging/sep/sep_driver.c index fe46c1b46472..c2d9cab85d42 100644 --- a/trunk/drivers/staging/sep/sep_driver.c +++ b/trunk/drivers/staging/sep/sep_driver.c @@ -2143,7 +2143,9 @@ static int sep_get_time_handler(unsigned long arg) struct sep_driver_get_time_t command_args; error = sep_set_time(&command_args.time_physical_address, &command_args.time_value); - error = copy_to_user((void *) arg, (void *) &command_args, sizeof(struct sep_driver_get_time_t)); + if (error == 0) + error = copy_to_user((void __user *)arg, + &command_args, sizeof(struct sep_driver_get_time_t)); return error; }