diff options
Diffstat (limited to 'drivers/ata/sata_nv.c')
-rw-r--r-- | drivers/ata/sata_nv.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c index 02169740ed24..e2e795e58236 100644 --- a/drivers/ata/sata_nv.c +++ b/drivers/ata/sata_nv.c | |||
@@ -1405,7 +1405,8 @@ static void nv_ck804_thaw(struct ata_port *ap) | |||
1405 | writeb(mask, mmio_base + NV_INT_ENABLE_CK804); | 1405 | writeb(mask, mmio_base + NV_INT_ENABLE_CK804); |
1406 | } | 1406 | } |
1407 | 1407 | ||
1408 | static int nv_hardreset(struct ata_port *ap, unsigned int *class) | 1408 | static int nv_hardreset(struct ata_port *ap, unsigned int *class, |
1409 | unsigned long deadline) | ||
1409 | { | 1410 | { |
1410 | unsigned int dummy; | 1411 | unsigned int dummy; |
1411 | 1412 | ||
@@ -1413,7 +1414,7 @@ static int nv_hardreset(struct ata_port *ap, unsigned int *class) | |||
1413 | * some controllers. Don't classify on hardreset. For more | 1414 | * some controllers. Don't classify on hardreset. For more |
1414 | * info, see http://bugme.osdl.org/show_bug.cgi?id=3352 | 1415 | * info, see http://bugme.osdl.org/show_bug.cgi?id=3352 |
1415 | */ | 1416 | */ |
1416 | return sata_std_hardreset(ap, &dummy); | 1417 | return sata_std_hardreset(ap, &dummy, deadline); |
1417 | } | 1418 | } |
1418 | 1419 | ||
1419 | static void nv_error_handler(struct ata_port *ap) | 1420 | static void nv_error_handler(struct ata_port *ap) |