Merge git://git.infradead.org/battery-2.6

[karo-tx-linux.git] / drivers / staging / wlan-ng / p80211req.c

diff --git a/drivers/staging/wlan-ng/p80211req.c b/drivers/staging/wlan-ng/p80211req.c
index e1e7bf1bf27c6eb058e4468f07bf9aadbe073bf9..207f080cfc9e0c2589bcd0f61d883e501e169764 100644 (file)
--- a/drivers/staging/wlan-ng/p80211req.c
+++ b/drivers/staging/wlan-ng/p80211req.c
@@ -107,7 +107,8 @@ int p80211req_dorequest(wlandevice_t *wlandev, u8 *msgbuf)
        }
 
        /* Check Permissions */
-       if (!capable(CAP_NET_ADMIN) && (msg->msgcode != DIDmsg_dot11req_mibget)) {
+       if (!capable(CAP_NET_ADMIN) &&
+       (msg->msgcode != DIDmsg_dot11req_mibget)) {
                printk(KERN_ERR
                       "%s: only dot11req_mibget allowed for non-root.\n",
                       wlandev->name);
@@ -128,7 +129,7 @@ int p80211req_dorequest(wlandevice_t *wlandev, u8 *msgbuf)
                wlandev->mlmerequest(wlandev, msg);
 
        clear_bit(1, &(wlandev->request_pending));
-       return result;          /* if result==0, msg->status still may contain an err */
+       return result;  /* if result==0, msg->status still may contain an err */
 }
 
 /*----------------------------------------------------------------