From 6ba9f286941ce969fa4dc00142548a7bd6eae8aa Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Fri, 20 Jul 2007 12:50:58 +0900 Subject: [PATCH] --- yaml --- r: 61992 b: refs/heads/master c: 83b6839ec33becca78ebf6035489733a62e750bb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ata/pata_platform.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 825ef3905040..7dd1b01eb3b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ea9e179f436f153fc19fdaef7abbc1e0da20762 +refs/heads/master: 83b6839ec33becca78ebf6035489733a62e750bb diff --git a/trunk/drivers/ata/pata_platform.c b/trunk/drivers/ata/pata_platform.c index 79f841bca593..a909f793ffc1 100644 --- a/trunk/drivers/ata/pata_platform.c +++ b/trunk/drivers/ata/pata_platform.c @@ -213,8 +213,9 @@ static int __devinit pata_platform_probe(struct platform_device *pdev) pata_platform_setup_port(&ap->ioaddr, pp_info); /* activate */ - return ata_host_activate(host, platform_get_irq(pdev, 0), ata_interrupt, - pp_info->irq_flags, &pata_platform_sht); + return ata_host_activate(host, platform_get_irq(pdev, 0), + ata_interrupt, pp_info ? pp_info->irq_flags + : 0, &pata_platform_sht); } /**