From: Antti Palosaari Date: Tue, 22 Jul 2014 03:18:19 +0000 (-0300) Subject: [media] rtl2832_sdr: remove plain 64-bit divisions X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a98ccfcf4804beb2651b9f44a4bc5cbb387019ec;p=linux-beck.git [media] rtl2832_sdr: remove plain 64-bit divisions Commit 0ba2aeb6dab80920edd9cf5b93b1ea4d6913b8f3 (v4l2-ctrls: increase internal min/max/step/def to 64 bit) changes v4l2 controls to 64-bit. Driver it not working on 32-bit arch as it uses directly control 'step' which is changed to 64-bit. Reported-by: kbuild test robot Cc: Hans Verkuil Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/dvb-frontends/rtl2832_sdr.c b/drivers/media/dvb-frontends/rtl2832_sdr.c index f58bd746d823..023e0f49c786 100644 --- a/drivers/media/dvb-frontends/rtl2832_sdr.c +++ b/drivers/media/dvb-frontends/rtl2832_sdr.c @@ -1364,17 +1364,16 @@ static int rtl2832_sdr_s_ctrl(struct v4l2_ctrl *ctrl) /* TODO: these controls should be moved to tuner drivers */ if (s->bandwidth_auto->val) { /* Round towards the closest legal value */ - s32 val = s->f_adc + s->bandwidth->step / 2; + s32 val = s->f_adc + div_u64(s->bandwidth->step, 2); u32 offset; val = clamp_t(s32, val, s->bandwidth->minimum, s->bandwidth->maximum); offset = val - s->bandwidth->minimum; offset = s->bandwidth->step * - (offset / s->bandwidth->step); + div_u64(offset, s->bandwidth->step); s->bandwidth->val = s->bandwidth->minimum + offset; } - c->bandwidth_hz = s->bandwidth->val; if (!test_bit(POWER_ON, &s->flags))