PCI/switchtec: Fix a MRPC error status handling issue

[linux-2.6-microblaze.git] / drivers / pci / switch / switchtec.c

diff --git a/drivers/pci/switch/switchtec.c b/drivers/pci/switch/switchtec.c
index e5bb2ac..5c300ff 100644 (file)
--- a/drivers/pci/switch/switchtec.c
+++ b/drivers/pci/switch/switchtec.c
@@ -238,7 +238,8 @@ static void mrpc_complete_cmd(struct switchtec_dev *stdev)
        stuser_set_state(stuser, MRPC_DONE);
        stuser->return_code = 0;
 
-       if (stuser->status != SWITCHTEC_MRPC_STATUS_DONE)
+       if (stuser->status != SWITCHTEC_MRPC_STATUS_DONE &&
+           stuser->status != SWITCHTEC_MRPC_STATUS_ERROR)
                goto out;
 
        if (stdev->dma_mrpc)
@@ -622,7 +623,8 @@ static ssize_t switchtec_dev_read(struct file *filp, char __user *data,
 out:
        mutex_unlock(&stdev->mrpc_mutex);
 
-       if (stuser->status == SWITCHTEC_MRPC_STATUS_DONE)
+       if (stuser->status == SWITCHTEC_MRPC_STATUS_DONE ||
+           stuser->status == SWITCHTEC_MRPC_STATUS_ERROR)
                return size;
        else if (stuser->status == SWITCHTEC_MRPC_STATUS_INTERRUPTED)
                return -ENXIO;