From 224125740a1f129690c759b0b69330b96ce2186d Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Fri, 1 Feb 2008 23:09:33 +0100 Subject: [PATCH] --- yaml --- r: 82145 b: refs/heads/master c: fadd11c71b5a100fb7560b84a6272b8883082726 h: refs/heads/master i: 82143: 24b94cc9de40369e81ad3044df7501783727050b v: v3 --- [refs] | 2 +- trunk/drivers/ide/arm/rapide.c | 4 ++-- trunk/drivers/ide/mips/au1xxx-ide.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f1038fb44b61..7db14a9423e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed908fa1d037d780ebd04a412693bf3fc9c3a8fe +refs/heads/master: fadd11c71b5a100fb7560b84a6272b8883082726 diff --git a/trunk/drivers/ide/arm/rapide.c b/trunk/drivers/ide/arm/rapide.c index e6b56d1d48f4..b5b6ed8b82b2 100644 --- a/trunk/drivers/ide/arm/rapide.c +++ b/trunk/drivers/ide/arm/rapide.c @@ -78,8 +78,8 @@ static void __devexit rapide_remove(struct expansion_card *ec) ecard_set_drvdata(ec, NULL); - /* there must be a better way */ - ide_unregister(hwif - ide_hwifs); + ide_unregister(hwif->index); + ecard_release_resources(ec); } diff --git a/trunk/drivers/ide/mips/au1xxx-ide.c b/trunk/drivers/ide/mips/au1xxx-ide.c index b00c71f2aee3..71782b38280b 100644 --- a/trunk/drivers/ide/mips/au1xxx-ide.c +++ b/trunk/drivers/ide/mips/au1xxx-ide.c @@ -691,7 +691,7 @@ static int au_ide_remove(struct device *dev) ide_hwif_t *hwif = dev_get_drvdata(dev); _auide_hwif *ahwif = &auide_hwif; - ide_unregister(hwif - ide_hwifs); + ide_unregister(hwif->index); iounmap((void *)ahwif->regbase);