Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f901e5d1 authored by Cornelia Huck's avatar Cornelia Huck Committed by Linus Torvalds
Browse files

[PATCH] s/390: compile fix for dcssblk 



Fix compile breakage in the dcss block driver introduced by the attribute
changes.

Signed-off-by: default avatarCornelia Huck <cohuck@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c551288e

drivers/s390/block/dcssblk.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -718,7 +718,7 @@ dcssblk_check_params(void) 
			buf[j-i] = dcssblk_segments[j];

			buf[j-i] = dcssblk_segments[j];

		}

		}

		buf[j-i] = '\0';

		buf[j-i] = '\0';

		rc = dcssblk_add_store(dcssblk_root_dev, buf, j-i);

		rc = dcssblk_add_store(dcssblk_root_dev, NULL, buf, j-i);

		if ((rc >= 0) && (dcssblk_segments[j] == '(')) {

		if ((rc >= 0) && (dcssblk_segments[j] == '(')) {

			for (k = 0; buf[k] != '\0'; k++)

			for (k = 0; buf[k] != '\0'; k++)

				buf[k] = toupper(buf[k]);

				buf[k] = toupper(buf[k]);
@@ -728,7 +728,7 @@ dcssblk_check_params(void) 
				up_read(&dcssblk_devices_sem);

				up_read(&dcssblk_devices_sem);

				if (dev_info)

				if (dev_info)

					dcssblk_shared_store(&dev_info->dev,

					dcssblk_shared_store(&dev_info->dev,

							     "0\n", 2);

							     NULL, "0\n", 2);

			}

			}

		}

		}

		while ((dcssblk_segments[j] != ',') &&

		while ((dcssblk_segments[j] != ',') &&