diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
| commit | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (patch) | |
| tree | d827bca3fc825a0ac33efbcd493713be40fcc812 /drivers/ata/pata_octeon_cf.c | |
| parent | cf7a2b4fb6a9b86779930a0a123b0df41aa9208f (diff) | |
| parent | f17a1f06d2fa93f4825be572622eb02c4894db4e (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
MAINTAINERS
arch/arm/mm/fault.c
Diffstat (limited to 'drivers/ata/pata_octeon_cf.c')
| -rw-r--r-- | drivers/ata/pata_octeon_cf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c index 8d9343accf3c..abdd19fe990a 100644 --- a/drivers/ata/pata_octeon_cf.c +++ b/drivers/ata/pata_octeon_cf.c | |||
| @@ -653,7 +653,8 @@ static irqreturn_t octeon_cf_interrupt(int irq, void *dev_instance) | |||
| 653 | 653 | ||
| 654 | ap = host->ports[i]; | 654 | ap = host->ports[i]; |
| 655 | ocd = ap->dev->platform_data; | 655 | ocd = ap->dev->platform_data; |
| 656 | if (!ap || (ap->flags & ATA_FLAG_DISABLED)) | 656 | |
| 657 | if (ap->flags & ATA_FLAG_DISABLED) | ||
| 657 | continue; | 658 | continue; |
| 658 | 659 | ||
| 659 | ocd = ap->dev->platform_data; | 660 | ocd = ap->dev->platform_data; |