From 2bd023c959f1857dc7d2206be2c5ab3348698728 Mon Sep 17 00:00:00 2001 From: Harvey Harrison Date: Wed, 13 Feb 2008 21:14:11 -0800 Subject: [PATCH] --- yaml --- r: 85679 b: refs/heads/master c: 48e1f800eaa08eefe00476b83a7983b707d31848 h: refs/heads/master i: 85677: c270ef4eb794100bb6acdb6026026e8a5e6d637d 85675: f1fddfb99c45201eb935879ef8322d166983c77b 85671: 22ad79b252b38df3df9d70b293e46c14fec6491e 85663: 2cd5cea9467333d093cba1f4f5e16b8ee85fdf5a v: v3 --- [refs] | 2 +- trunk/drivers/ata/sata_via.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0fb0194c4777..ac0a7e33a886 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6903c0f7efe907ada1b9636b52c5ae11fd51ab68 +refs/heads/master: 48e1f800eaa08eefe00476b83a7983b707d31848 diff --git a/trunk/drivers/ata/sata_via.c b/trunk/drivers/ata/sata_via.c index 30caa0337190..0d03f44824fb 100644 --- a/trunk/drivers/ata/sata_via.c +++ b/trunk/drivers/ata/sata_via.c @@ -333,8 +333,8 @@ static int vt6420_prereset(struct ata_link *link, unsigned long deadline) static void vt6420_error_handler(struct ata_port *ap) { - return ata_bmdma_drive_eh(ap, vt6420_prereset, ata_std_softreset, - NULL, ata_std_postreset); + ata_bmdma_drive_eh(ap, vt6420_prereset, ata_std_softreset, NULL, + ata_std_postreset); } static int vt6421_pata_cable_detect(struct ata_port *ap)