Merge branch 'for-linus' into for-next

[linux-2.6-microblaze.git] / drivers / firewire / core-cdev.c

diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
index 708e417..c9fe590 100644 (file)
--- a/drivers/firewire/core-cdev.c
+++ b/drivers/firewire/core-cdev.c
@@ -1216,7 +1216,9 @@ static int ioctl_get_cycle_timer2(struct client *client, union ioctl_arg *arg)
 
        local_irq_disable();
 
-       cycle_time = card->driver->read_csr(card, CSR_CYCLE_TIME);
+       ret = fw_card_read_cycle_time(card, &cycle_time);
+       if (ret < 0)
+               goto end;
 
        switch (a->clk_id) {
        case CLOCK_REALTIME:      ktime_get_real_ts64(&ts);     break;
@@ -1225,7 +1227,7 @@ static int ioctl_get_cycle_timer2(struct client *client, union ioctl_arg *arg)
        default:
                ret = -EINVAL;
        }
-
+end:
        local_irq_enable();
 
        a->tv_sec      = ts.tv_sec;