diff options
Diffstat (limited to 'drivers/staging/brcm80211/util')
-rw-r--r-- | drivers/staging/brcm80211/util/bcmotp.c | 16 | ||||
-rw-r--r-- | drivers/staging/brcm80211/util/bcmsrom.c | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/util/bcmutils.c | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/drivers/staging/brcm80211/util/bcmotp.c b/drivers/staging/brcm80211/util/bcmotp.c index 8907841..c4a252e 100644 --- a/drivers/staging/brcm80211/util/bcmotp.c +++ b/drivers/staging/brcm80211/util/bcmotp.c @@ -384,7 +384,7 @@ static int ipxotp_read_region(void *oh, int region, u16 *data, uint *wlen) sz = (uint) oi->hwlim - oi->hwbase; if (!(oi->status & OTPS_GUP_HW)) { *wlen = sz; - return -BCME_NOTFOUND; + return -ENODATA; } if (*wlen < sz) { *wlen = sz; @@ -396,7 +396,7 @@ static int ipxotp_read_region(void *oh, int region, u16 *data, uint *wlen) sz = ((uint) oi->swlim - oi->swbase); if (!(oi->status & OTPS_GUP_SW)) { *wlen = sz; - return -BCME_NOTFOUND; + return -ENODATA; } if (*wlen < sz) { *wlen = sz; @@ -408,7 +408,7 @@ static int ipxotp_read_region(void *oh, int region, u16 *data, uint *wlen) sz = OTPGU_CI_SZ; if (!(oi->status & OTPS_GUP_CI)) { *wlen = sz; - return -BCME_NOTFOUND; + return -ENODATA; } if (*wlen < sz) { *wlen = sz; @@ -420,7 +420,7 @@ static int ipxotp_read_region(void *oh, int region, u16 *data, uint *wlen) sz = (uint) oi->flim - oi->fbase; if (!(oi->status & OTPS_GUP_FUSE)) { *wlen = sz; - return -BCME_NOTFOUND; + return -ENODATA; } if (*wlen < sz) { *wlen = sz; @@ -432,7 +432,7 @@ static int ipxotp_read_region(void *oh, int region, u16 *data, uint *wlen) sz = ((uint) oi->flim - oi->hwbase); if (!(oi->status & (OTPS_GUP_HW | OTPS_GUP_SW))) { *wlen = sz; - return -BCME_NOTFOUND; + return -ENODATA; } if (*wlen < sz) { *wlen = sz; @@ -708,7 +708,7 @@ static int hndotp_read_region(void *oh, int region, u16 *data, uint *wlen) /* Region empty? */ st = oi->hwprot | oi->signvalid; if ((st & region) == 0) - return -BCME_NOTFOUND; + return -ENODATA; *wlen = ((int)*wlen < oi->boundary / 2) ? *wlen : (uint) oi->boundary / 2; @@ -926,13 +926,13 @@ otp_read_region(si_t *sih, int region, u16 *data, si_otp_power(sih, true); if (!si_is_otp_powered(sih) || si_is_otp_disabled(sih)) { - err = -BCME_NOTREADY; + err = -EPERM; goto out; } oh = otp_init(sih); if (oh == NULL) { - err = -BCME_ERROR; + err = -EBADE; goto out; } diff --git a/drivers/staging/brcm80211/util/bcmsrom.c b/drivers/staging/brcm80211/util/bcmsrom.c index d61753d..7d400ff 100644 --- a/drivers/staging/brcm80211/util/bcmsrom.c +++ b/drivers/staging/brcm80211/util/bcmsrom.c @@ -280,7 +280,7 @@ static int otp_read_pci(si_t *sih, u16 *buf, uint bufsz) otp = kzalloc(OTP_SZ_MAX, GFP_ATOMIC); if (otp == NULL) { - return -BCME_ERROR; + return -EBADE; } err = otp_read_region(sih, OTP_HW_RGN, (u16 *) otp, &sz); diff --git a/drivers/staging/brcm80211/util/bcmutils.c b/drivers/staging/brcm80211/util/bcmutils.c index 9448881..b908277 100644 --- a/drivers/staging/brcm80211/util/bcmutils.c +++ b/drivers/staging/brcm80211/util/bcmutils.c @@ -519,7 +519,7 @@ int bcm_iovar_lencheck(const bcm_iovar_t *vi, void *arg, int len, bool set) bcmerror = -ENOTSUPP; } else if (len) { /* Set is an action w/o parameters */ - bcmerror = -BCME_BUFTOOLONG; + bcmerror = -ENOBUFS; } break; |