Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / arch / x86 / kernel / ds.c

diff --git a/arch/x86/kernel/ds.c b/arch/x86/kernel/ds.c
index 1c5ca4d187877544dc4838f39ee31ae8d0493448..11c11b8ec48dd59f1494c2051433dd8f6f2a7777 100644 (file)
--- a/arch/x86/kernel/ds.c
+++ b/arch/x86/kernel/ds.c
@@ -220,11 +220,11 @@ int ds_allocate(void **dsp, size_t bts_size_in_bytes)
 
 int ds_free(void **dsp)
 {
-       if (*dsp)
+       if (*dsp) {
                kfree((void *)get_bts_buffer_base(*dsp));
-       kfree(*dsp);
-       *dsp = 0;
-
+               kfree(*dsp);
+               *dsp = NULL;
+       }
        return 0;
 }