diff options
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/cio/vfio_ccw_ops.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/drivers/s390/cio/vfio_ccw_ops.c b/drivers/s390/cio/vfio_ccw_ops.c index 55d0c87e73c3..e72abbc18ee3 100644 --- a/drivers/s390/cio/vfio_ccw_ops.c +++ b/drivers/s390/cio/vfio_ccw_ops.c @@ -126,19 +126,14 @@ static int vfio_ccw_mdev_remove(struct mdev_device *mdev) { struct vfio_ccw_private *private = dev_get_drvdata(mdev_parent_dev(mdev)); - int ret; - - if ((private->state == VFIO_CCW_STATE_NOT_OPER) || - (private->state == VFIO_CCW_STATE_STANDBY)) - goto out; - - ret = vfio_ccw_mdev_reset(mdev); - if (ret) - return ret; - private->state = VFIO_CCW_STATE_STANDBY; + if ((private->state != VFIO_CCW_STATE_NOT_OPER) && + (private->state != VFIO_CCW_STATE_STANDBY)) { + if (!vfio_ccw_mdev_reset(mdev)) + private->state = VFIO_CCW_STATE_STANDBY; + /* The state will be NOT_OPER on error. */ + } -out: private->mdev = NULL; atomic_inc(&private->avail); |