There is no time limit. If they accept a return of mistaken contribution, they are supposed to correct whatever year's Form 1099-SA showed the original distribution.
Note that HSA custodians seem to be extremely bad about correcting Forms 1099-SA for this reason. They seem to expect you to report the amount as a rollover, but that's not really proper.
