Merge remote-tracking branch 'regulator/topic/max8997' into regulator-next

[karo-tx-linux.git] / fs / cifs / connect.c

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 7635b5db26a7d78fc0140ecc556054592388ad95..12b3da39733b2bc180cd1ac4a164d9f0d071e99a 100644 (file)
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -1624,14 +1624,11 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
                case Opt_unc:
                        string = vol->UNC;
                        vol->UNC = match_strdup(args);
-                       if (vol->UNC == NULL) {
-                               kfree(string);
+                       if (vol->UNC == NULL)
                                goto out_nomem;
-                       }
 
                        convert_delimiter(vol->UNC, '\\');
                        if (vol->UNC[0] != '\\' || vol->UNC[1] != '\\') {
-                               kfree(string);
                                printk(KERN_ERR "CIFS: UNC Path does not "
                                                "begin with // or \\\\\n");
                                goto cifs_parse_mount_err;
@@ -1687,10 +1684,8 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
 
                        string = vol->prepath;
                        vol->prepath = match_strdup(args);
-                       if (vol->prepath == NULL) {
-                               kfree(string);
+                       if (vol->prepath == NULL)
                                goto out_nomem;
-                       }
                        /* Compare old prefixpath= option to new one */
                        if (!string || strcmp(string, vol->prepath))
                                printk(KERN_WARNING "CIFS: the value of the "
@@ -1922,7 +1917,7 @@ srcip_matches(struct sockaddr *srcaddr, struct sockaddr *rhs)
        }
        case AF_INET6: {
                struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *)srcaddr;
-               struct sockaddr_in6 *vaddr6 = (struct sockaddr_in6 *)&rhs;
+               struct sockaddr_in6 *vaddr6 = (struct sockaddr_in6 *)rhs;
                return ipv6_addr_equal(&saddr6->sin6_addr, &vaddr6->sin6_addr);
        }
        default: