Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 58708
b: refs/heads/master
c: 5f45bc5
h: refs/heads/master
v: v3
  • Loading branch information
Sonic Zhang authored and Jeff Garzik committed Jul 9, 2007
1 parent d86c615 commit 5ca01b7
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d0e580316e3db9f5cf6a605cc311ffb0372f0a35
refs/heads/master: 5f45bc50976ee1f408f7171af155aec646655a37
6 changes: 4 additions & 2 deletions trunk/drivers/ata/pata_platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ static int __devinit pata_platform_probe(struct platform_device *pdev)
struct resource *io_res, *ctl_res;
struct ata_host *host;
struct ata_port *ap;
struct pata_platform_info *pp_info;
unsigned int mmio;

/*
Expand Down Expand Up @@ -208,11 +209,12 @@ static int __devinit pata_platform_probe(struct platform_device *pdev)

ap->ioaddr.altstatus_addr = ap->ioaddr.ctl_addr;

pata_platform_setup_port(&ap->ioaddr, pdev->dev.platform_data);
pp_info = (struct pata_platform_info *)(pdev->dev.platform_data);
pata_platform_setup_port(&ap->ioaddr, pp_info);

/* activate */
return ata_host_activate(host, platform_get_irq(pdev, 0), ata_interrupt,
0, &pata_platform_sht);
pp_info->irq_flags, &pata_platform_sht);
}

/**
Expand Down
5 changes: 5 additions & 0 deletions trunk/include/linux/pata_platform.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ struct pata_platform_info {
* spacing used by ata_std_ports().
*/
unsigned int ioport_shift;
/*
* Indicate platform specific irq types and initial
* IRQ flags when call request_irq()
*/
unsigned int irq_flags;
};

#endif /* __LINUX_PATA_PLATFORM_H */

0 comments on commit 5ca01b7

Please sign in to comment.