From 365fb97741cd878604c68691ba0e4fb32e736616 Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Tue, 12 Feb 2013 05:01:51 +0100 Subject: [PATCH] --- yaml --- r: 354491 b: refs/heads/master c: ae87d63664721c9022ad709077de82b02b8227ca h: refs/heads/master i: 354489: 2e5cea1a38c996a9922b1b599b48a5ce18aa9c9b 354487: 4740aae363352f6d241624ee2361d12eb29c7ffb v: v3 --- [refs] | 2 +- trunk/drivers/staging/dgrp/dgrp_specproc.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 490a7581e422..006a4d09a00c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 76426daf50d5df38893cc189e9ccd026093debc8 +refs/heads/master: ae87d63664721c9022ad709077de82b02b8227ca diff --git a/trunk/drivers/staging/dgrp/dgrp_specproc.c b/trunk/drivers/staging/dgrp/dgrp_specproc.c index dfdaede71ff4..13c7ccf163c5 100644 --- a/trunk/drivers/staging/dgrp/dgrp_specproc.c +++ b/trunk/drivers/staging/dgrp/dgrp_specproc.c @@ -777,14 +777,11 @@ static int dgrp_remove_nd(struct nd_struct *nd) dgrp_remove_node_class_sysfs_files(nd); } - if (nd->nd_mon_de) - unregister_dgrp_device(nd->nd_mon_de); + unregister_dgrp_device(nd->nd_mon_de); - if (nd->nd_ports_de) - unregister_dgrp_device(nd->nd_ports_de); + unregister_dgrp_device(nd->nd_ports_de); - if (nd->nd_dpa_de) - unregister_dgrp_device(nd->nd_dpa_de); + unregister_dgrp_device(nd->nd_dpa_de); dgrp_tty_uninit(nd);