From e543fb08be48a478357a312b3345465cb14ada62 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Mon, 16 Jul 2007 14:29:40 +0900 Subject: [PATCH] --- yaml --- r: 62015 b: refs/heads/master c: f8f1e1cc0cd4d75c73e9a55a0ede8958e4fa14f1 h: refs/heads/master i: 62013: 721d546418c88d916d7fcda67f037dc9f05d0b08 62011: b82cac2355e16780ba22bcfb2a35f1b303dc5554 62007: 1373e76334d33b71957623c398cf0a0dd22045a4 61999: 2065b9161134f2ac0f34a2cf7ea2aa2d140128ba 61983: 1526d45e0e425adf3573b93b2659459291695c57 61951: b28b183d31ad35134993139f147a926cd3d775fb v: v3 --- [refs] | 2 +- trunk/include/linux/libata.h | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c22a475eb892..5583f2008574 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ae463171cc1b1ea6dad7bcb298e96c073e7373e +refs/heads/master: f8f1e1cc0cd4d75c73e9a55a0ede8958e4fa14f1 diff --git a/trunk/include/linux/libata.h b/trunk/include/linux/libata.h index 16ebdf152c75..74800ad6d81f 100644 --- a/trunk/include/linux/libata.h +++ b/trunk/include/linux/libata.h @@ -915,16 +915,17 @@ extern void __ata_ehi_push_desc(struct ata_eh_info *ehi, const char *fmt, ...); extern void ata_ehi_push_desc(struct ata_eh_info *ehi, const char *fmt, ...); extern void ata_ehi_clear_desc(struct ata_eh_info *ehi); -static inline void __ata_ehi_hotplugged(struct ata_eh_info *ehi) +static inline void ata_ehi_schedule_probe(struct ata_eh_info *ehi) { - ehi->flags |= ATA_EHI_HOTPLUGGED | ATA_EHI_RESUME_LINK; + ehi->flags |= ATA_EHI_RESUME_LINK; ehi->action |= ATA_EH_SOFTRESET; ehi->probe_mask |= (1 << ATA_MAX_DEVICES) - 1; } static inline void ata_ehi_hotplugged(struct ata_eh_info *ehi) { - __ata_ehi_hotplugged(ehi); + ata_ehi_schedule_probe(ehi); + ehi->flags |= ATA_EHI_HOTPLUGGED; ehi->err_mask |= AC_ERR_ATA_BUS; }