merge bcmdhd fix from gillbert32