[PATCH-next 0/2] Fix coding errors and enable driver selection