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);