mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-29 04:09:39 +00:00
Code Issues Releases Wiki Activity

staging: Fix some incorrect use of positive error codes.

Browse source 
Use -E... instead of just E... in a few places where negative error
codes are expected by a functions callers.  These were found by grepping
with coccinelle & then inspecting by hand to determine which were bugs.

The staging/cxt1e1 driver appears to intentionally use positive E...
error codes in some places, and negative -E... error codes in others,
making it hard to know which is intended where - very likely I missed
some problems in that driver.

Signed-off-by: Ralph Loader <suckfish@ihug.co.nz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Ralph Loader 2011-01-21 19:27:53 +13:00 committed by Greg Kroah-Hartman
parent 01ebd764da
commit 3ec6080e2e
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/staging/ath6kl/os/linux/ioctl.c
View file

@ -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);

2
drivers/staging/brcm80211/brcmfmac/wl_iw.c
View file

@ -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));

2
drivers/staging/cxt1e1/linux.c
View file

@ -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));

2
drivers/staging/westbridge/astoria/device/cyasdevice.c
View file

@ -389,7 +389,7 @@ EXPORT_SYMBOL(cyasdevice_gethaltag);
static int __init cyasdevice_init(void)
{
if (cyasdevice_initialize() != 0)
return ENODEV;
return -ENODEV;
return 0;
}