diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-25 12:17:53 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-25 12:17:53 +1000 |
| commit | 59ade3d432c8a4ee045fdd82269832ebdad3ddde (patch) | |
| tree | f02bef0cd2bf72136b09fddee3db013450913464 /drivers/net/wireless/libertas_tf/if_usb.c | |
| parent | c63acae643f164f9d65d7d39f39365c552e7602a (diff) | |
| parent | c3a326ddfc2de6ba5aa49beb7764def2f65e25f5 (diff) | |
Merge branch 'quilt/rr'
Conflicts:
drivers/net/virtio_net.c
drivers/net/wireless/libertas_tf/if_usb.c
drivers/staging/rtl8187se/r8180_core.c
Diffstat (limited to 'drivers/net/wireless/libertas_tf/if_usb.c')
| -rw-r--r-- | drivers/net/wireless/libertas_tf/if_usb.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/libertas_tf/if_usb.c b/drivers/net/wireless/libertas_tf/if_usb.c index c445500ffc61..803ad6e9ae53 100644 --- a/drivers/net/wireless/libertas_tf/if_usb.c +++ b/drivers/net/wireless/libertas_tf/if_usb.c @@ -812,12 +812,15 @@ static int if_usb_prog_firmware(struct if_usb_card *cardp) lbtf_deb_enter(LBTF_DEB_USB); + kparam_block_sysfs_write(fw_name); ret = request_firmware(&cardp->fw, lbtf_fw_name, &cardp->udev->dev); if (ret < 0) { pr_err("request_firmware() failed with %#x\n", ret); pr_err("firmware %s not found\n", lbtf_fw_name); + kparam_unblock_sysfs_write(fw_name); goto done; } + kparam_unblock_sysfs_write(fw_name); if (check_fwfile_format(cardp->fw->data, cardp->fw->size)) goto release_fw; |