Comment 21 for bug 385658

Created an attachment (id=29454)
Move logic for matching devices out of probe routine