From: Jeff Garzik <jgarzik@pobox.com>
To: Bryan Wu <cooloney@kernel.org>
Cc: linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org,
Sonic Zhang <sonic.zhang@analog.com>
Subject: Re: [PATCH 3/3] [libata/BF54x]: Fix compling failure bug - change variable's name according to API update
Date: Fri, 25 Apr 2008 01:20:31 -0400 [thread overview]
Message-ID: <48116A1F.6070907@pobox.com> (raw)
In-Reply-To: <1209094676-20360-4-git-send-email-cooloney@kernel.org>
Bryan Wu wrote:
> From: Sonic Zhang <sonic.zhang@analog.com>
>
> Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
> Signed-off-by: Bryan Wu <cooloney@kernel.org>
> ---
> drivers/ata/pata_bf54x.c | 5 ++---
> 1 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c
> index 4142894..94b818e 100644
> --- a/drivers/ata/pata_bf54x.c
> +++ b/drivers/ata/pata_bf54x.c
> @@ -1342,7 +1342,7 @@ static int bfin_port_start(struct ata_port *ap)
> inline unsigned int bfin_ata_host_intr(struct ata_port *ap,
> struct ata_queued_cmd *qc)
> {
> - struct ata_eh_info *ehi = &ap->eh_info;
> + struct ata_eh_info *ehi = &ap->link.eh_info;
> u8 status, host_stat = 0;
>
> VPRINTK("ata%u: protocol %d task_state %d\n",
> @@ -1443,11 +1443,10 @@ irqreturn_t bfin_ata_interrupt(int irq, void *dev_instance)
> !(ap->flags & ATA_FLAG_DISABLED)) {
> struct ata_queued_cmd *qc;
>
> - qc = ata_qc_from_tag(ap, ap->active_tag);
> + qc = ata_qc_from_tag(ap, ap->link.active_tag);
> if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING)) &&
> (qc->flags & ATA_QCFLAG_ACTIVE))
> handled |= bfin_ata_host_intr(ap, qc);
you need to combine this patch with the first patch, to form a single
logical whole.
Build fixes should always be folded into the patch that introduces that
problem (unless the patch is already upstream, of course). Otherwise,
you potentially introduce git-bisect breakage.
Jeff
prev parent reply other threads:[~2008-04-25 5:20 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-25 3:37 [PATCH 0/3] [libata/BF54x]: bug fixing and updates Bryan Wu
2008-04-25 3:37 ` [PATCH 1/3] [libata/BF54x]: decrease count first Bryan Wu
2008-04-25 3:37 ` [PATCH 2/3] [libata/BF54x]: Fix bug - Implement bfin ata interrupt handler to avoid "irq 68 nobody cared" Bryan Wu
2008-04-25 5:17 ` Jeff Garzik
2008-04-25 6:27 ` Bryan Wu
2008-04-25 3:37 ` [PATCH 3/3] [libata/BF54x]: Fix compling failure bug - change variable's name according to API update Bryan Wu
2008-04-25 5:20 ` Jeff Garzik [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=48116A1F.6070907@pobox.com \
--to=jgarzik@pobox.com \
--cc=cooloney@kernel.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sonic.zhang@analog.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).