Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[linux-2.6-block.git] / drivers / net / wan / hdlc_fr.c

diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index 840cff72a0f1a5596ff407651d2c81c305c8a3e9..0e52993e20798ff763dceb3d5a34fccdba111e5c 100644 (file)
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -182,7 +182,7 @@ static inline pvc_device* find_pvc(hdlc_device *hdlc, u16 dlci)
                if (pvc->dlci == dlci)
                        return pvc;
                if (pvc->dlci > dlci)
-                       return NULL; /* the listed is sorted */
+                       return NULL; /* the list is sorted */
                pvc = pvc->next;
        }
 
@@ -1214,10 +1214,10 @@ static int fr_ioctl(struct net_device *dev, struct ifreq *ifr)
                return 0;
 
        case IF_PROTO_FR:
-               if(!capable(CAP_NET_ADMIN))
+               if (!capable(CAP_NET_ADMIN))
                        return -EPERM;
 
-               if(dev->flags & IFF_UP)
+               if (dev->flags & IFF_UP)
                        return -EBUSY;
 
                if (copy_from_user(&new_settings, fr_s, size))
@@ -1263,7 +1263,7 @@ static int fr_ioctl(struct net_device *dev, struct ifreq *ifr)
                if (dev_to_hdlc(dev)->proto != &proto) /* Different proto */
                        return -EINVAL;
 
-               if(!capable(CAP_NET_ADMIN))
+               if (!capable(CAP_NET_ADMIN))
                        return -EPERM;
 
                if (copy_from_user(&pvc, ifr->ifr_settings.ifs_ifsu.fr_pvc,