From cae6b0c23491f7f7fdf8a21a75bfcf27b0162c79 Mon Sep 17 00:00:00 2001 From: Borislav Petkov Date: Sat, 2 Feb 2008 19:56:33 +0100 Subject: [PATCH] --- yaml --- r: 82531 b: refs/heads/master c: 9a24b63db06a4b9389367ebafd9b0cfb5dd1b39f h: refs/heads/master i: 82529: 7700907c3f191ee45e104a885ca7bfb8d02e961e 82527: 2721104ed57438e8c7328c26943d16402f55574d v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-floppy.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bf1e3aa069c8..31c7b4d2b087 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0078df2ece5a752e878410e39eb31e075183b4e7 +refs/heads/master: 9a24b63db06a4b9389367ebafd9b0cfb5dd1b39f diff --git a/trunk/drivers/ide/ide-floppy.c b/trunk/drivers/ide/ide-floppy.c index 66dfd1811101..771bfaff93b3 100644 --- a/trunk/drivers/ide/ide-floppy.c +++ b/trunk/drivers/ide/ide-floppy.c @@ -438,12 +438,12 @@ static struct ide_floppy_obj *ide_floppy_get(struct gendisk *disk) return floppy; } -static void ide_floppy_release(struct kref *); +static void idefloppy_cleanup_obj(struct kref *); static void ide_floppy_put(struct ide_floppy_obj *floppy) { mutex_lock(&idefloppy_ref_mutex); - kref_put(&floppy->kref, ide_floppy_release); + kref_put(&floppy->kref, idefloppy_cleanup_obj); mutex_unlock(&idefloppy_ref_mutex); } @@ -1713,7 +1713,7 @@ static void ide_floppy_remove(ide_drive_t *drive) ide_floppy_put(floppy); } -static void ide_floppy_release(struct kref *kref) +static void idefloppy_cleanup_obj(struct kref *kref) { struct ide_floppy_obj *floppy = to_ide_floppy(kref); ide_drive_t *drive = floppy->drive;