diff --git a/[refs] b/[refs] index b7aae0ba7b88..22976cf57e57 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7caaeabb17758295edff9703c18a840073c5b8f4 +refs/heads/master: 074c5279ef671e4fcd2ce2960ecc9d7d9735fabd diff --git a/trunk/drivers/sbus/char/bpp.c b/trunk/drivers/sbus/char/bpp.c index 87302fb14885..ccb20a6f5f36 100644 --- a/trunk/drivers/sbus/char/bpp.c +++ b/trunk/drivers/sbus/char/bpp.c @@ -295,8 +295,7 @@ static unsigned short get_pins(unsigned minor) static void snooze(unsigned long snooze_time, unsigned minor) { - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(snooze_time + 1); + schedule_timeout_uninterruptible(snooze_time + 1); } static int wait_for(unsigned short set, unsigned short clr, diff --git a/trunk/drivers/sbus/char/vfc_i2c.c b/trunk/drivers/sbus/char/vfc_i2c.c index 739cad9b19a1..ceec30648f4f 100644 --- a/trunk/drivers/sbus/char/vfc_i2c.c +++ b/trunk/drivers/sbus/char/vfc_i2c.c @@ -81,8 +81,7 @@ int vfc_pcf8584_init(struct vfc_dev *dev) void vfc_i2c_delay_no_busy(struct vfc_dev *dev, unsigned long usecs) { - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(usecs_to_jiffies(usecs)); + schedule_timeout_uninterruptible(usecs_to_jiffies(usecs)); } void inline vfc_i2c_delay(struct vfc_dev *dev)