X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fs390%2Fchar%2Ftape_block.c;h=5ced2725d6c705fda1529cafece44847d83df96b;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=b70d926902424dd9943c8dbfbc1c8353a03b7804;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c
index b70d92690..5ced2725d 100644
--- a/drivers/s390/char/tape_block.c
+++ b/drivers/s390/char/tape_block.c
@@ -198,7 +198,9 @@ tapeblock_request_fn(request_queue_t *queue)
 
 	device = (struct tape_device *) queue->queuedata;
 	DBF_LH(6, "tapeblock_request_fn(device=%p)\n", device);
-	BUG_ON(device == NULL);
+	if (device == NULL)
+		BUG();
+
 	tapeblock_trigger_requeue(device);
 }
 
@@ -305,7 +307,8 @@ tapeblock_revalidate_disk(struct gendisk *disk)
 	int			rc;
 
 	device = (struct tape_device *) disk->private_data;
-	BUG_ON(!device);
+	if (!device)
+		BUG();
 
 	if (!device->blk_data.medium_changed)
 		return 0;
@@ -432,14 +435,16 @@ tapeblock_ioctl(
 ) {
 	int rc;
 	int minor;
-	struct gendisk *disk;
-	struct tape_device *device;
+	struct gendisk *disk = inode->i_bdev->bd_disk;
+	struct tape_device *device = disk->private_data;
 
 	rc     = 0;
 	disk   = inode->i_bdev->bd_disk;
-	BUG_ON(!disk);
+	if (!disk)
+		BUG();
 	device = disk->private_data;
-	BUG_ON(!device);
+	if (!device)
+		BUG();
 	minor  = iminor(inode);
 
 	DBF_LH(6, "tapeblock_ioctl(0x%0x)\n", command);