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

Commit f976069a authored by Peter Oberparleiter's avatar Peter Oberparleiter Committed by Linus Torvalds
Browse files

[PATCH] s390: minor tape fixes 



Cleanup of minor bugs found by a source code checker.

Signed-off-by: default avatarPeter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7220fe8b

drivers/s390/char/tape_block.c

+2 −2
Original line number Diff line number Diff line
@@ -432,8 +432,8 @@ tapeblock_ioctl( 
) {

	int rc;

	int minor;

	struct gendisk *disk = inode->i_bdev->bd_disk;

	struct tape_device *device = disk->private_data;

	struct gendisk *disk;

	struct tape_device *device;



	rc     = 0;

	disk   = inode->i_bdev->bd_disk;

drivers/s390/char/tape_core.c

+3 −7
Original line number Diff line number Diff line
@@ -210,18 +210,14 @@ tape_state_set(struct tape_device *device, enum tape_state newstate) 
		return;

	}

	DBF_EVENT(4, "ts. dev:	%x\n", device->first_minor);

	if (device->tape_state < TO_SIZE && device->tape_state >= 0)

		str = tape_state_verbose[device->tape_state];

	else

		str = "UNKNOWN TS";

	DBF_EVENT(4, "old ts:	%s\n", str);

	if (device->tape_state < TO_SIZE && device->tape_state >=0 )

	DBF_EVENT(4, "old ts:\t\n");

	if (device->tape_state < TS_SIZE && device->tape_state >=0 )

		str = tape_state_verbose[device->tape_state];

	else

		str = "UNKNOWN TS";

	DBF_EVENT(4, "%s\n", str);

	DBF_EVENT(4, "new ts:\t\n");

	if (newstate < TO_SIZE && newstate >= 0)

	if (newstate < TS_SIZE && newstate >= 0)

		str = tape_state_verbose[newstate];

	else

		str = "UNKNOWN TS";