summaryrefslogtreecommitdiff
path: root/drivers/pci/pci-sysfs.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-12-21 13:46:30 +0300
committerTakashi Iwai <tiwai@suse.de>2015-12-21 13:46:30 +0300
commit1d9d4495001d3c470e5c902ff35a6aa626924fc1 (patch)
tree1ae39f4ccadb610bc16fea88a1f93b23a4df37b1 /drivers/pci/pci-sysfs.c
parentd3d33aabac51341065bcce0e9c2d9d27902a08c4 (diff)
parente2dc7d7d8ed3019f72855af1c3dcda3fb456b488 (diff)
downloadlinux-1d9d4495001d3c470e5c902ff35a6aa626924fc1.tar.xz
Merge branch 'topic/hdmi-jack' into for-next
Diffstat (limited to 'drivers/pci/pci-sysfs.c')
-rw-r--r--drivers/pci/pci-sysfs.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 92618686604c..eead54cd01b2 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -216,7 +216,10 @@ static ssize_t numa_node_store(struct device *dev,
if (ret)
return ret;
- if (node >= MAX_NUMNODES || !node_online(node))
+ if ((node < 0 && node != NUMA_NO_NODE) || node >= MAX_NUMNODES)
+ return -EINVAL;
+
+ if (node != NUMA_NO_NODE && !node_online(node))
return -EINVAL;
add_taint(TAINT_FIRMWARE_WORKAROUND, LOCKDEP_STILL_OK);