diff options
author | Nicholas Johnson <nicholas.johnson-opensource@outlook.com.au> | 2020-04-13 21:04:25 +0300 |
---|---|---|
committer | Mika Westerberg <mika.westerberg@linux.intel.com> | 2020-04-16 11:37:38 +0300 |
commit | cbb5494ebce5dfafab27de01e7e8bfe6d7c6a27f (patch) | |
tree | ec4f3bf8bae55ca66f55ac91c25ddf3602183453 /drivers | |
parent | 8f3d9f354286745c751374f5f1fcafee6b3f3136 (diff) | |
download | linux-cbb5494ebce5dfafab27de01e7e8bfe6d7c6a27f.tar.xz |
Revert "thunderbolt: Prevent crash if non-active NVMem file is read"
This reverts commit 03cd45d2e219301880cabc357e3cf478a500080f.
Commit 664f0549380c ("nvmem: core: use is_bin_visible for permissions")
incidentally adds support for write-only nvmem. Hence, this workaround
is no longer required, so drop it.
Signed-off-by: Nicholas Johnson <nicholas.johnson-opensource@outlook.com.au>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/thunderbolt/switch.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c index a2ce99051c51..1ba4050f68ac 100644 --- a/drivers/thunderbolt/switch.c +++ b/drivers/thunderbolt/switch.c @@ -348,12 +348,6 @@ out: return ret; } -static int tb_switch_nvm_no_read(void *priv, unsigned int offset, void *val, - size_t bytes) -{ - return -EPERM; -} - static int tb_switch_nvm_write(void *priv, unsigned int offset, void *val, size_t bytes) { @@ -399,7 +393,6 @@ static struct nvmem_device *register_nvmem(struct tb_switch *sw, int id, config.read_only = true; } else { config.name = "nvm_non_active"; - config.reg_read = tb_switch_nvm_no_read; config.reg_write = tb_switch_nvm_write; config.root_only = true; } |