From 8116d8c9d81bdc48f891360f656d826e90d1b000 Mon Sep 17 00:00:00 2001
From: Ralph Loader <suckfish@ihug.co.nz>
Date: Fri, 21 Jan 2011 19:27:53 +1300
Subject: [PATCH] --- yaml --- r: 235678 b: refs/heads/master c:
 3ec6080e2e5be05e6f7fbbe5ab20b0eab84e166b h: refs/heads/master v: v3

---
 [refs]                                                 |  2 +-
 trunk/drivers/staging/ath6kl/os/linux/ioctl.c          | 10 +++++-----
 trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c       |  2 +-
 trunk/drivers/staging/cxt1e1/linux.c                   |  2 +-
 .../staging/westbridge/astoria/device/cyasdevice.c     |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 1441e58d3541..7267c198b356 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01ebd764dab26b3064b0c73ddcf726dd4b41485a
+refs/heads/master: 3ec6080e2e5be05e6f7fbbe5ab20b0eab84e166b
diff --git a/trunk/drivers/staging/ath6kl/os/linux/ioctl.c b/trunk/drivers/staging/ath6kl/os/linux/ioctl.c
index d5f7ac08ab96..0b10376fad2d 100644
--- a/trunk/drivers/staging/ath6kl/os/linux/ioctl.c
+++ b/trunk/drivers/staging/ath6kl/os/linux/ioctl.c
@@ -440,7 +440,7 @@ ar6000_ioctl_set_rssi_threshold(struct net_device *dev, struct ifreq *rq)
             if (ar->rssi_map[j+1].rssi < ar->rssi_map[j].rssi) {
                 SWAP_THOLD(ar->rssi_map[j+1], ar->rssi_map[j]);
             } else if (ar->rssi_map[j+1].rssi == ar->rssi_map[j].rssi) {
-                return EFAULT;
+                return -EFAULT;
             }
         }
     }
@@ -449,7 +449,7 @@ ar6000_ioctl_set_rssi_threshold(struct net_device *dev, struct ifreq *rq)
             if (ar->rssi_map[j+1].rssi < ar->rssi_map[j].rssi) {
                 SWAP_THOLD(ar->rssi_map[j+1], ar->rssi_map[j]);
             } else if (ar->rssi_map[j+1].rssi == ar->rssi_map[j].rssi) {
-                return EFAULT;
+                return -EFAULT;
             }
         }
     }
@@ -2870,7 +2870,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                                              gpio_output_set_cmd.enable_mask,
                                              gpio_output_set_cmd.disable_mask);
                 if (ret != A_OK) {
-                    ret = EIO;
+                    ret = -EIO;
                 }
             }
             up(&ar->arSem);
@@ -2950,7 +2950,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                                                gpio_register_cmd.gpioreg_id,
                                                gpio_register_cmd.value);
                 if (ret != A_OK) {
-                    ret = EIO;
+                    ret = -EIO;
                 }
 
                 /* Wait for acknowledgement from Target */
@@ -3041,7 +3041,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
             } else {
                 ret = ar6000_gpio_intr_ack(dev, gpio_intr_ack_cmd.ack_mask);
                 if (ret != A_OK) {
-                    ret = EIO;
+                    ret = -EIO;
                 }
             }
             up(&ar->arSem);
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c b/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c
index 7167d4735e2a..f4b1b4ecab82 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c
@@ -1368,7 +1368,7 @@ wl_iw_iscan_set_scan(struct net_device *dev,
 	if (g_scan_specified_ssid) {
 		WL_TRACE("%s Specific SCAN already running ignoring BC scan\n",
 			 __func__);
-		return EBUSY;
+		return -EBUSY;
 	}
 
 	memset(&ssid, 0, sizeof(ssid));
diff --git a/trunk/drivers/staging/cxt1e1/linux.c b/trunk/drivers/staging/cxt1e1/linux.c
index 0f78f8962751..9ced08f253b3 100644
--- a/trunk/drivers/staging/cxt1e1/linux.c
+++ b/trunk/drivers/staging/cxt1e1/linux.c
@@ -548,7 +548,7 @@ do_set_port (struct net_device * ndev, void *data)
         return -EINVAL;             /* get card info */
 
     if (pp.portnum >= ci->max_port) /* sanity check */
-        return ENXIO;
+        return -ENXIO;
 
     memcpy (&ci->port[pp.portnum].p, &pp, sizeof (struct sbecom_port_param));
     return mkret (c4_set_port (ci, pp.portnum));
diff --git a/trunk/drivers/staging/westbridge/astoria/device/cyasdevice.c b/trunk/drivers/staging/westbridge/astoria/device/cyasdevice.c
index c76e38375010..088973076517 100644
--- a/trunk/drivers/staging/westbridge/astoria/device/cyasdevice.c
+++ b/trunk/drivers/staging/westbridge/astoria/device/cyasdevice.c
@@ -389,7 +389,7 @@ EXPORT_SYMBOL(cyasdevice_gethaltag);
 static int __init cyasdevice_init(void)
 {
 	if (cyasdevice_initialize() != 0)
-		return ENODEV;
+		return -ENODEV;
 
 	return 0;
 }