diff options
| author | Joerg Roedel <jroedel@suse.de> | 2019-06-24 10:23:16 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2019-06-24 10:23:16 +0200 |
| commit | ceedd5f74d8cfe34db4e654a7808e3c5de40d6f5 (patch) | |
| tree | e19c18292231202e9cd8d484ee43f46b2c9c9ad1 /drivers/vfio/mdev/mdev_sysfs.c | |
| parent | 1b961423158caaae49d3900b7c9c37477bbfa9b3 (diff) | |
| parent | 4b972a01a7da614b4796475f933094751a295a2f (diff) | |
Merge tag 'v5.2-rc6' into generic-dma-ops
Linux 5.2-rc6
Diffstat (limited to 'drivers/vfio/mdev/mdev_sysfs.c')
| -rw-r--r-- | drivers/vfio/mdev/mdev_sysfs.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/vfio/mdev/mdev_sysfs.c b/drivers/vfio/mdev/mdev_sysfs.c index cbf94b8165ea..7570c7602ab4 100644 --- a/drivers/vfio/mdev/mdev_sysfs.c +++ b/drivers/vfio/mdev/mdev_sysfs.c @@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * File attributes for Mediated devices * * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. * Author: Neo Jia <cjia@nvidia.com> * Kirti Wankhede <kwankhede@nvidia.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ #include <linux/sysfs.h> @@ -236,11 +233,9 @@ static ssize_t remove_store(struct device *dev, struct device_attribute *attr, if (val && device_remove_file_self(dev, attr)) { int ret; - ret = mdev_device_remove(dev, false); - if (ret) { - device_create_file(dev, attr); + ret = mdev_device_remove(dev); + if (ret) return ret; - } } return count; |