Make sure that driver name  is optional.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1'