Merge commit 'linus/master' into merge-linus

[~andy/linux] / drivers / s390 / crypto / ap_bus.c

diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index 326db1e827c4dbe41f70419a9af53b1a997a7e7a..e3fe6838293ad4f238cd9bb81df92a59ec61d72b 100644 (file)
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -659,9 +659,9 @@ static ssize_t poll_timeout_store(struct bus_type *bus, const char *buf,
        hr_time = ktime_set(0, poll_timeout);
 
        if (!hrtimer_is_queued(&ap_poll_timer) ||
-           !hrtimer_forward(&ap_poll_timer, ap_poll_timer.expires, hr_time)) {
-               ap_poll_timer.expires = hr_time;
-               hrtimer_start(&ap_poll_timer, hr_time, HRTIMER_MODE_ABS);
+           !hrtimer_forward(&ap_poll_timer, hrtimer_get_expires(&ap_poll_timer), hr_time)) {
+               hrtimer_set_expires(&ap_poll_timer, hr_time);
+               hrtimer_start_expires(&ap_poll_timer, HRTIMER_MODE_ABS);
        }
        return count;
 }