[PATCH 1/1] staging: hv: Fix error checking in channel.c

Greg KH gregkh at suse.de
Thu May 13 16:33:16 UTC 2010


On Thu, May 13, 2010 at 03:56:30PM +0000, Haiyang Zhang wrote:
> From: Haiyang Zhang <haiyangz at microsoft.com>
> 
> Subject: staging: hv: Fix error checking in channel.c
> Fixed errors in return value checking code, which caused vmbus channel
> not functioning.

Doh, sorry about that.  Bill, be a bit more careful in the future
please, this came in on your ASSERT cleanup patch.

thanks,

greg k-h

> ---
>  drivers/staging/hv/channel.c |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/staging/hv/channel.c b/drivers/staging/hv/channel.c
> index 12c351e..f047c5a 100644
> --- a/drivers/staging/hv/channel.c
> +++ b/drivers/staging/hv/channel.c
> @@ -204,13 +204,13 @@ int VmbusChannelOpen(struct vmbus_channel *NewChannel, u32 SendRingBufferSize,
>  					   RecvRingBufferSize) >> PAGE_SHIFT;
>  
>  	ret = RingBufferInit(&NewChannel->Outbound, out, SendRingBufferSize);
> -	if (!ret) {
> +	if (ret != 0) {
>  		err = ret;
>  		goto errorout;
>  	}
>  
>  	ret = RingBufferInit(&NewChannel->Inbound, in, RecvRingBufferSize);
> -	if (!ret) {
> +	if (ret != 0) {
>  		err = ret;
>  		goto errorout;
>  	}
> @@ -228,7 +228,7 @@ int VmbusChannelOpen(struct vmbus_channel *NewChannel, u32 SendRingBufferSize,
>  					 RecvRingBufferSize,
>  					 &NewChannel->RingBufferGpadlHandle);
>  
> -	if (!ret) {
> +	if (ret != 0) {
>  		err = ret;
>  		goto errorout;
>  	}
> @@ -569,7 +569,7 @@ int VmbusChannelEstablishGpadl(struct vmbus_channel *Channel, void *Kbuffer,
>  			ret = VmbusPostMessage(gpadlBody,
>  					       subMsgInfo->MessageSize -
>  					       sizeof(*subMsgInfo));
> -			if (!ret)
> +			if (ret != 0)
>  				goto Cleanup;
>  
>  		}
> -- 
> 1.6.3.2
> 





More information about the devel mailing list