From 9271f44bfc735b7c4d1b4f319e5e623026f2fca5 Mon Sep 17 00:00:00 2001 From: Devendra Naga Date: Tue, 22 Jan 2013 03:38:17 -0500 Subject: [PATCH] --- yaml --- r: 354131 b: refs/heads/master c: 7b63c5772fd6eea71b1332570812297e45403126 h: refs/heads/master i: 354129: 42b63d535830018af44b2afd27105c7a8f09c089 354127: a2231bab3a37ceb5a25a722a9f5a660ea248bb48 v: v3 --- [refs] | 2 +- trunk/drivers/staging/dgrp/dgrp_specproc.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e2f9bfe652d2..6b7370d75603 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b194218dba531b9c36080d29d10fdf9ef96a15bf +refs/heads/master: 7b63c5772fd6eea71b1332570812297e45403126 diff --git a/trunk/drivers/staging/dgrp/dgrp_specproc.c b/trunk/drivers/staging/dgrp/dgrp_specproc.c index c214078a89e9..e09fc9cf318b 100644 --- a/trunk/drivers/staging/dgrp/dgrp_specproc.c +++ b/trunk/drivers/staging/dgrp/dgrp_specproc.c @@ -181,13 +181,13 @@ static struct dgrp_proc_entry dgrp_dpa_table[] = { void dgrp_unregister_proc(void) { - unregister_proc_table(dgrp_table, dgrp_proc_dir_entry); net_entry_pointer = NULL; mon_entry_pointer = NULL; dpa_entry_pointer = NULL; ports_entry_pointer = NULL; if (dgrp_proc_dir_entry) { + unregister_proc_table(dgrp_table, dgrp_proc_dir_entry); remove_proc_entry(dgrp_proc_dir_entry->name, dgrp_proc_dir_entry->parent); dgrp_proc_dir_entry = NULL; @@ -231,6 +231,8 @@ static void register_proc_table(struct dgrp_proc_entry *table, if (table == NULL) return; + if (root == NULL) + return; for (; table->id; table++) { /* Can't do anything without a proc name. */