From: mikem@beardog.cca.cpqcorp.net

This patch moves the check of the controller to before trying to enable it.
If a controller is disabled the system will Oops without this fix.  This in
the 2.4 tree.