diff --git a/[refs] b/[refs] index d3fc3c19d027..e45a7ca04d9f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9fd1b2857154f1ac32ca041641ba947525ff7fa +refs/heads/master: 66bb16de6b9a05936d1eeb20155bab008b476191 diff --git a/trunk/drivers/atm/horizon.c b/trunk/drivers/atm/horizon.c index 54720baa7363..a95790452a68 100644 --- a/trunk/drivers/atm/horizon.c +++ b/trunk/drivers/atm/horizon.c @@ -1645,10 +1645,8 @@ static int hrz_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) { unsigned short d = 0; char * s = skb->data; if (*s++ == 'D') { - for (i = 0; i < 4; ++i) { - d = (d<<4) | ((*s <= '9') ? (*s - '0') : (*s - 'a' + 10)); - ++s; - } + for (i = 0; i < 4; ++i) + d = (d << 4) | hex_to_bin(*s++); PRINTK (KERN_INFO, "debug bitmap is now %hx", debug = d); } }