2 files changed, 17 insertions, 19 deletions

diff --git a/drivers/media/dvb/firewire/firedtv-avc.c b/drivers/media/dvb/firewire/firedtv-avc.c
index 21c52e3b522e..489ae8245867 100644
--- a/drivers/media/dvb/firewire/firedtv-avc.c
+++ b/drivers/media/dvb/firewire/firedtv-avc.c
@@ -1208,7 +1208,7 @@ int avc_ca_pmt(struct firedtv *fdtv, char *msg, int length)
         if (r->response != AVC_RESPONSE_ACCEPTED) {
                 dev_err(fdtv->device,
                         "CA PMT failed with response 0x%x\n", r->response);
-                ret = -EFAULT;
+                ret = -EACCES;
         }
 out:
         mutex_unlock(&fdtv->avc_mutex);
diff --git a/drivers/media/dvb/firewire/firedtv-ci.c b/drivers/media/dvb/firewire/firedtv-ci.c
index 8ffb565f0704..e5ebdbfe8c19 100644
--- a/drivers/media/dvb/firewire/firedtv-ci.c
+++ b/drivers/media/dvb/firewire/firedtv-ci.c
@@ -45,11 +45,6 @@ static int fdtv_get_ca_flags(struct firedtv_tuner_status *stat)
         return flags;
 }
 
-static int fdtv_ca_reset(struct firedtv *fdtv)
-{
-        return avc_ca_reset(fdtv) ? -EFAULT : 0;
-}
-
 static int fdtv_ca_get_caps(void *arg)
 {
         struct ca_caps *cap = arg;
@@ -65,12 +60,14 @@ static int fdtv_ca_get_slot_info(struct firedtv *fdtv, void *arg)
 {
         struct firedtv_tuner_status stat;
         struct ca_slot_info *slot = arg;
+        int err;
 
-        if (avc_tuner_status(fdtv, &stat))
-                return -EFAULT;
+        err = avc_tuner_status(fdtv, &stat);
+        if (err)
+                return err;
 
         if (slot->num != 0)
-                return -EFAULT;
+                return -EACCES;
 
         slot->type = CA_CI;
         slot->flags = fdtv_get_ca_flags(&stat);
@@ -81,21 +78,21 @@ static int fdtv_ca_app_info(struct firedtv *fdtv, void *arg)
 {
         struct ca_msg *reply = arg;
 
-        return avc_ca_app_info(fdtv, reply->msg, &reply->length) ? -EFAULT : 0;
+        return avc_ca_app_info(fdtv, reply->msg, &reply->length);
 }
 
 static int fdtv_ca_info(struct firedtv *fdtv, void *arg)
 {
         struct ca_msg *reply = arg;
 
-        return avc_ca_info(fdtv, reply->msg, &reply->length) ? -EFAULT : 0;
+        return avc_ca_info(fdtv, reply->msg, &reply->length);
 }
 
 static int fdtv_ca_get_mmi(struct firedtv *fdtv, void *arg)
 {
         struct ca_msg *reply = arg;
 
-        return avc_ca_get_mmi(fdtv, reply->msg, &reply->length) ? -EFAULT : 0;
+        return avc_ca_get_mmi(fdtv, reply->msg, &reply->length);
 }
 
 static int fdtv_ca_get_msg(struct firedtv *fdtv, void *arg)
@@ -111,14 +108,15 @@ static int fdtv_ca_get_msg(struct firedtv *fdtv, void *arg)
                 err = fdtv_ca_info(fdtv, arg);
                 break;
         default:
-                if (avc_tuner_status(fdtv, &stat))
-                        err = -EFAULT;
-                else if (stat.ca_mmi == 1)
+                err = avc_tuner_status(fdtv, &stat);
+                if (err)
+                        break;
+                if (stat.ca_mmi == 1)
                         err = fdtv_ca_get_mmi(fdtv, arg);
                 else {
                         dev_info(fdtv->device, "unhandled CA message 0x%08x\n",
                                  fdtv->ca_last_command);
-                        err = -EFAULT;
+                        err = -EACCES;
                 }
         }
         fdtv->ca_last_command = 0;
@@ -141,7 +139,7 @@ static int fdtv_ca_pmt(struct firedtv *fdtv, void *arg)
                 data_length = msg->msg[3];
         }
 
-        return avc_ca_pmt(fdtv, &msg->msg[data_pos], data_length) ? -EFAULT : 0;
+        return avc_ca_pmt(fdtv, &msg->msg[data_pos], data_length);
 }
 
 static int fdtv_ca_send_msg(struct firedtv *fdtv, void *arg)
@@ -170,7 +168,7 @@ static int fdtv_ca_send_msg(struct firedtv *fdtv, void *arg)
         default:
                 dev_err(fdtv->device, "unhandled CA message 0x%08x\n",
                         fdtv->ca_last_command);
-                err = -EFAULT;
+                err = -EACCES;
         }
         return err;
 }
@@ -184,7 +182,7 @@ static int fdtv_ca_ioctl(struct file *file, unsigned int cmd, void *arg)
 
         switch (cmd) {
         case CA_RESET:
-                err = fdtv_ca_reset(fdtv);
+                err = avc_ca_reset(fdtv);
                 break;
         case CA_GET_CAP:
                 err = fdtv_ca_get_caps(arg);