|
@@ -3992,14 +3992,14 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err,
|
|
u8 saveclk;
|
|
u8 saveclk;
|
|
|
|
|
|
brcmf_dbg(TRACE, "Enter: dev=%s, err=%d\n", dev_name(dev), err);
|
|
brcmf_dbg(TRACE, "Enter: dev=%s, err=%d\n", dev_name(dev), err);
|
|
|
|
+ bus_if = dev_get_drvdata(dev);
|
|
|
|
+ sdiodev = bus_if->bus_priv.sdio;
|
|
if (err)
|
|
if (err)
|
|
goto fail;
|
|
goto fail;
|
|
|
|
|
|
- bus_if = dev_get_drvdata(dev);
|
|
|
|
if (!bus_if->drvr)
|
|
if (!bus_if->drvr)
|
|
return;
|
|
return;
|
|
|
|
|
|
- sdiodev = bus_if->bus_priv.sdio;
|
|
|
|
bus = sdiodev->bus;
|
|
bus = sdiodev->bus;
|
|
|
|
|
|
/* try to download image and nvram to the dongle */
|
|
/* try to download image and nvram to the dongle */
|
|
@@ -4088,6 +4088,7 @@ release:
|
|
fail:
|
|
fail:
|
|
brcmf_dbg(TRACE, "failed: dev=%s, err=%d\n", dev_name(dev), err);
|
|
brcmf_dbg(TRACE, "failed: dev=%s, err=%d\n", dev_name(dev), err);
|
|
device_release_driver(dev);
|
|
device_release_driver(dev);
|
|
|
|
+ device_release_driver(&sdiodev->func[2]->dev);
|
|
}
|
|
}
|
|
|
|
|
|
struct brcmf_sdio *brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev)
|
|
struct brcmf_sdio *brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev)
|