1 files changed, 6 insertions, 1 deletions

diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c
index a8c5e0b914e4..51d151c0e962 100644
--- a/net/rfkill/rfkill.c
+++ b/net/rfkill/rfkill.c
@@ -190,6 +190,10 @@ static ssize_t rfkill_claim_store(struct device *dev,
         if (error)
                 return error;
 
+        if (rfkill->user_claim_unsupported) {
+                error = -EOPNOTSUPP;
+                goto out_unlock;
+        }
         if (rfkill->user_claim != claim) {
                 if (!claim)
                         rfkill_toggle_radio(rfkill,
@@ -197,9 +201,10 @@ static ssize_t rfkill_claim_store(struct device *dev,
                 rfkill->user_claim = claim;
         }
 
+out_unlock:
         mutex_unlock(&rfkill_mutex);
 
-        return count;
+        return error ? error : count;
 }
 
 static struct device_attribute rfkill_dev_attrs[] = {