From f6d8663e6a2b499edde3ccb511f337cf1142722a Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Fri, 17 Oct 2008 18:09:10 +0200 Subject: [PATCH] --- yaml --- r: 116305 b: refs/heads/master c: 8f29cd9f12e97d46e601f59810ea6aadd938945d h: refs/heads/master i: 116303: 1283962a66075f17c7b91168e36a4ae4a845e495 v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-floppy.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7dd3696ddff8..2d84d0bff40e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae9f9f073963c56dcc4601ed9a0921eda1e8fa9d +refs/heads/master: 8f29cd9f12e97d46e601f59810ea6aadd938945d diff --git a/trunk/drivers/ide/ide-floppy.c b/trunk/drivers/ide/ide-floppy.c index bcbd980f7a48..4a3d7e08b65a 100644 --- a/trunk/drivers/ide/ide-floppy.c +++ b/trunk/drivers/ide/ide-floppy.c @@ -560,8 +560,9 @@ sector_t ide_floppy_capacity(ide_drive_t *drive) return capacity; } -static void idefloppy_setup(ide_drive_t *drive, idefloppy_floppy_t *floppy) +static void idefloppy_setup(ide_drive_t *drive) { + struct ide_floppy_obj *floppy = drive->driver_data; u16 *id = drive->id; drive->pc_callback = ide_floppy_callback; @@ -808,7 +809,7 @@ static int ide_floppy_probe(ide_drive_t *drive) drive->debug_mask = debug_mask; - idefloppy_setup(drive, floppy); + idefloppy_setup(drive); g->minors = 1 << PARTN_BITS; g->driverfs_dev = &drive->gendev;