Merge remote-tracking branch 'asoc/fix/sgtl5000' into asoc-linus

[karo-tx-linux.git] / mm / memory_hotplug.c

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index cd2990fdf6c129aba0c10959fa0eb96e3909beaa..ca1dd3aa5eee89a924da879735d59b26cd96387f 100644 (file)
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -914,19 +914,19 @@ int __ref online_pages(unsigned long pfn, unsigned long nr_pages, int online_typ
        if ((zone_idx(zone) > ZONE_NORMAL || online_type == ONLINE_MOVABLE) &&
            !can_online_high_movable(zone)) {
                unlock_memory_hotplug();
-               return -1;
+               return -EINVAL;
        }
 
        if (online_type == ONLINE_KERNEL && zone_idx(zone) == ZONE_MOVABLE) {
                if (move_pfn_range_left(zone - 1, zone, pfn, pfn + nr_pages)) {
                        unlock_memory_hotplug();
-                       return -1;
+                       return -EINVAL;
                }
        }
        if (online_type == ONLINE_MOVABLE && zone_idx(zone) == ZONE_MOVABLE - 1) {
                if (move_pfn_range_right(zone, zone + 1, pfn, pfn + nr_pages)) {
                        unlock_memory_hotplug();
-                       return -1;
+                       return -EINVAL;
                }
        }