ucc_geth: Fix sneaky merge conflict regarding bus_id