diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-12 16:54:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-12 16:54:43 -0400 |
| commit | a890b15c0990cc8d686edcc85f5fccde71ad5ce9 (patch) | |
| tree | 73162355b58283a2531f13fbbf663809f95c1483 /drivers/s390/char/tape_block.c | |
| parent | 79fa1b677be3a985cc66b9218a4dd09818f1051b (diff) | |
| parent | 26ec634c31a11a003040e10b4d650495158632fd (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/s390/char/tape_block.c')
| -rw-r--r-- | drivers/s390/char/tape_block.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c index 5c65cf3e5cc0..b70d92690242 100644 --- a/drivers/s390/char/tape_block.c +++ b/drivers/s390/char/tape_block.c | |||
| @@ -432,8 +432,8 @@ tapeblock_ioctl( | |||
| 432 | ) { | 432 | ) { |
| 433 | int rc; | 433 | int rc; |
| 434 | int minor; | 434 | int minor; |
| 435 | struct gendisk *disk = inode->i_bdev->bd_disk; | 435 | struct gendisk *disk; |
| 436 | struct tape_device *device = disk->private_data; | 436 | struct tape_device *device; |
| 437 | 437 | ||
| 438 | rc = 0; | 438 | rc = 0; |
| 439 | disk = inode->i_bdev->bd_disk; | 439 | disk = inode->i_bdev->bd_disk; |