diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-08-05 17:10:52 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-08-05 17:10:52 -0400 |
| commit | 13efdbecc65ef6ec4028551fb223dea5c5e3143c (patch) | |
| tree | 634a2ce082abe3eb2a5defe0f1ddc2f3eb10f085 /drivers/ata/libata-eh.c | |
| parent | 61f4a10cb4e9447a85245c63b3e7f46e09299fed (diff) | |
| parent | 6fd210a9cc398ecbff7bcdbe220651b73b654f56 (diff) | |
Merge branch 'pm-upstream/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-stable
Diffstat (limited to 'drivers/ata/libata-eh.c')
| -rw-r--r-- | drivers/ata/libata-eh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index 1a07c061f644..79711b64054b 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c | |||
| @@ -2327,7 +2327,7 @@ int ata_eh_reset(struct ata_link *link, int classify, | |||
| 2327 | struct ata_port *ap = link->ap; | 2327 | struct ata_port *ap = link->ap; |
| 2328 | struct ata_link *slave = ap->slave_link; | 2328 | struct ata_link *slave = ap->slave_link; |
| 2329 | struct ata_eh_context *ehc = &link->eh_context; | 2329 | struct ata_eh_context *ehc = &link->eh_context; |
| 2330 | struct ata_eh_context *sehc = &slave->eh_context; | 2330 | struct ata_eh_context *sehc = slave ? &slave->eh_context : NULL; |
| 2331 | unsigned int *classes = ehc->classes; | 2331 | unsigned int *classes = ehc->classes; |
| 2332 | unsigned int lflags = link->flags; | 2332 | unsigned int lflags = link->flags; |
| 2333 | int verbose = !(ehc->i.flags & ATA_EHI_QUIET); | 2333 | int verbose = !(ehc->i.flags & ATA_EHI_QUIET); |