aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLi Zefan2008-10-18 22:28:07 -0500
committerLinus Torvalds2008-10-20 10:52:38 -0500
commitc012a54ae0b2ee2c73499f54596e0f5257288fec (patch)
tree4fab77415948c241c563a4de1e8e29fcc0604828 /security/device_cgroup.c
parent2cdc7241a290bb2b9ef4c2e2969a4a3ed92abb63 (diff)
downloadam43-linux-kernel-c012a54ae0b2ee2c73499f54596e0f5257288fec.tar.gz
am43-linux-kernel-c012a54ae0b2ee2c73499f54596e0f5257288fec.tar.xz
am43-linux-kernel-c012a54ae0b2ee2c73499f54596e0f5257288fec.zip
devcgroup: remove unused variable
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> Acked-by: Serge Hallyn <serue@us.ibm.com> Cc: Paul Menage <menage@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'security/device_cgroup.c')
-rw-r--r--security/device_cgroup.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index 9c625f65ee5..d5c15a7c67c 100644
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -355,7 +355,7 @@ static int devcgroup_update_access(struct dev_cgroup *devcgroup,
355 struct dev_cgroup *cur_devcgroup; 355 struct dev_cgroup *cur_devcgroup;
356 const char *b; 356 const char *b;
357 char *endp; 357 char *endp;
358 int retval = 0, count; 358 int count;
359 struct dev_whitelist_item wh; 359 struct dev_whitelist_item wh;
360 360
361 if (!capable(CAP_SYS_ADMIN)) 361 if (!capable(CAP_SYS_ADMIN))
@@ -432,7 +432,6 @@ static int devcgroup_update_access(struct dev_cgroup *devcgroup,
432 } 432 }
433 433
434handle: 434handle:
435 retval = 0;
436 switch (filetype) { 435 switch (filetype) {
437 case DEVCG_ALLOW: 436 case DEVCG_ALLOW:
438 if (!parent_has_perm(devcgroup, &wh)) 437 if (!parent_has_perm(devcgroup, &wh))