From: Peter Oberparleiter Cleanup of minor bugs found by a source code checker. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton --- drivers/s390/char/tape_block.c | 4 ++-- drivers/s390/char/tape_core.c | 10 +++------- 2 files changed, 5 insertions(+), 9 deletions(-) diff -puN drivers/s390/char/tape_block.c~s390-minor-tape-fixes drivers/s390/char/tape_block.c --- 25/drivers/s390/char/tape_block.c~s390-minor-tape-fixes Mon Apr 3 16:03:45 2006 +++ 25-akpm/drivers/s390/char/tape_block.c Mon Apr 3 16:03:45 2006 @@ -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; diff -puN drivers/s390/char/tape_core.c~s390-minor-tape-fixes drivers/s390/char/tape_core.c --- 25/drivers/s390/char/tape_core.c~s390-minor-tape-fixes Mon Apr 3 16:03:45 2006 +++ 25-akpm/drivers/s390/char/tape_core.c Mon Apr 3 16:03:45 2006 @@ -210,18 +210,14 @@ tape_state_set(struct tape_device *devic 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"; _