adap->fe_adap[0].fe = dvb_attach(dib9000_attach, &adap->dev->i2c_adap, 0x80, &stk9090m_config);
 
-       return adap->fe_adap[0].fe == NULL ?  -ENODEV : 0;
+       if (!adap->fe_adap[0].fe) {
+               release_firmware(state->frontend_firmware);
+               return -ENODEV;
+       }
+
+       return 0;
 }
 
 static int dib9090_tuner_attach(struct dvb_usb_adapter *adap)
        dib9000_i2c_enumeration(&adap->dev->i2c_adap, 1, 0x20, 0x80);
        adap->fe_adap[0].fe = dvb_attach(dib9000_attach, &adap->dev->i2c_adap, 0x80, &nim9090md_config[0]);
 
-       if (adap->fe_adap[0].fe == NULL)
+       if (!adap->fe_adap[0].fe) {
+               release_firmware(state->frontend_firmware);
                return -ENODEV;
+       }
 
        i2c = dib9000_get_i2c_master(adap->fe_adap[0].fe, DIBX000_I2C_INTERFACE_GPIO_3_4, 0);
        dib9000_i2c_enumeration(i2c, 1, 0x12, 0x82);
        fe_slave = dvb_attach(dib9000_attach, i2c, 0x82, &nim9090md_config[1]);
        dib9000_set_slave_frontend(adap->fe_adap[0].fe, fe_slave);
 
-       return fe_slave == NULL ?  -ENODEV : 0;
+       if (!fe_slave) {
+               release_firmware(state->frontend_firmware);
+               return -ENODEV;
+       }
+
+       return 0;
 }
 
 static int nim9090md_tuner_attach(struct dvb_usb_adapter *adap)