Fixed usage of config option in generic driver

Change-Id: I8460578bee8916c184e32b1ea9ae1de559e69348
Closes-Bug: #1314216
Merge "Fixed usage of config option in generic driver"