From: Dan Carpenter <error27@gmail.com>
Date: Mon, 26 Apr 2010 10:10:06 +0000 (+0200)
Subject: cifs: change && to ||
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ad6cca6d5d0f713e1987e20ed982cfa9eb16b27e;p=linux-beck.git

cifs: change && to ||

This is a typo, if pvolume_info were NULL it would oops.

This function is used in clean up and error handling.  The current code
never passes a NULL pvolume_info, but it could pass a NULL *pvolume_info
if the kmalloc() failed.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
---

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index c2793bd1db4a..7a47c7c5c7e3 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -2421,7 +2421,7 @@ cleanup_volume_info(struct smb_vol **pvolume_info)
 {
 	struct smb_vol *volume_info;
 
-	if (!pvolume_info && !*pvolume_info)
+	if (!pvolume_info || !*pvolume_info)
 		return;
 
 	volume_info = *pvolume_info;