From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed, 24 Aug 2011 15:15:13 +0000 (+0200)
Subject: [S390] memory hotplug: only unassign assigned increments
X-Git-Tag: accepted/tizen/common/20141203.182822~6318^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8adb4ca344b48bbbf87ca66fd07a2dd503619714;p=platform%2Fkernel%2Flinux-arm64.git

[S390] memory hotplug: only unassign assigned increments

Make sure that only assigned storage increments are unassigned when
attaching a storage element.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/drivers/s390/char/sclp_cmd.c b/drivers/s390/char/sclp_cmd.c
index be55fb2..837e010 100644
--- a/drivers/s390/char/sclp_cmd.c
+++ b/drivers/s390/char/sclp_cmd.c
@@ -383,8 +383,10 @@ static int sclp_attach_storage(u8 id)
 	switch (sccb->header.response_code) {
 	case 0x0020:
 		set_bit(id, sclp_storage_ids);
-		for (i = 0; i < sccb->assigned; i++)
-			sclp_unassign_storage(sccb->entries[i] >> 16);
+		for (i = 0; i < sccb->assigned; i++) {
+			if (sccb->entries[i])
+				sclp_unassign_storage(sccb->entries[i] >> 16);
+		}
 		break;
 	default:
 		rc = -EIO;