]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
ide: fix IDE PMAC breakage
authorAndreas Schwab <schwab@suse.de>
Mon, 19 Jan 2009 12:46:56 +0000 (13:46 +0100)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Mon, 19 Jan 2009 12:46:56 +0000 (13:46 +0100)
commitbb54affa6fbdd6fe80f193ec1b6977a93078785d
treee14633a5d0ca0414c9956b1270dc500f3ea408b1
parentf3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b
ide: fix IDE PMAC breakage

Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> writes:

> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
> ---
>  drivers/ide/ide-probe.c |    9 ++-------
>  1 file changed, 2 insertions(+), 7 deletions(-)
>
> Index: b/drivers/ide/ide-probe.c
> ===================================================================
> --- a/drivers/ide/ide-probe.c
> +++ b/drivers/ide/ide-probe.c
> @@ -640,14 +640,9 @@ static int ide_register_port(ide_hwif_t
>   /* register with global device tree */
>   dev_set_name(&hwif->gendev, hwif->name);
>   hwif->gendev.driver_data = hwif;
> - if (hwif->gendev.parent == NULL) {
> - if (hwif->dev)
> - hwif->gendev.parent = hwif->dev;
> - else
> - /* Would like to do = &device_legacy */
> - hwif->gendev.parent = NULL;
> - }
> + hwif->gendev.parent = hwif->dev;

This [bart: commit 96d40941236722777c259775640b8880b7dc6f33 ("ide: small
ide_register_port() cleanup")] breaks ide-pmac.  It overwrites the parent
that pmac_ide_macio_attach has set.

Signed-off-by: Andreas Schwab <schwab@suse.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
drivers/ide/ide-probe.c