direct-io.hg

changeset 7766:cc5450d52e49

Missed two files from NULL-pointer-check changeset.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Fri Nov 11 14:54:20 2005 +0100 (2005-11-11)
parents fcb7e5616102
children e002282b79c8
files linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Fri Nov 11 12:55:47 2005 +0100
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Fri Nov 11 14:54:20 2005 +0100
     1.3 @@ -1173,8 +1173,7 @@ again:
     1.4   destroy_ring:
     1.5  	shutdown_device(info);
     1.6   out:
     1.7 -	if (backend)
     1.8 -		kfree(backend);
     1.9 +	kfree(backend);
    1.10  	return err;
    1.11  }
    1.12  
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c	Fri Nov 11 12:55:47 2005 +0100
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c	Fri Nov 11 14:54:20 2005 +0100
     2.3 @@ -570,10 +570,8 @@ void xenbus_dev_error(struct xenbus_devi
     2.4  	}
     2.5  
     2.6  fail:
     2.7 -	if (printf_buffer)
     2.8 -		kfree(printf_buffer);
     2.9 -	if (path_buffer)
    2.10 -		kfree(path_buffer);
    2.11 +	kfree(printf_buffer);
    2.12 +	kfree(path_buffer);
    2.13  }
    2.14  EXPORT_SYMBOL(xenbus_dev_error);
    2.15