mirror of
https://github.com/torvalds/linux.git
synced 2024-11-01 04:53:36 +01:00
Update core.c
1:The control flow was simplified by using else if statements instead of goto structure. 2:Error conditions are handled more clearly. 3:The device_unlock call at the end of the function is guaranteed in all cases.
This commit is contained in:
parent
9852d85ec9
commit
5b036330b2
1 changed files with 10 additions and 18 deletions
|
@ -40,27 +40,19 @@ int nfc_fw_download(struct nfc_dev *dev, const char *firmware_name)
|
|||
|
||||
if (dev->shutting_down) {
|
||||
rc = -ENODEV;
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (dev->dev_up) {
|
||||
}else if (dev->dev_up) {
|
||||
rc = -EBUSY;
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (!dev->ops->fw_download) {
|
||||
}else if (!dev->ops->fw_download) {
|
||||
rc = -EOPNOTSUPP;
|
||||
goto error;
|
||||
}
|
||||
}else{
|
||||
dev->fw_download_in_progress = true;
|
||||
rc = dev->ops->fw_download(dev, firmware_name);
|
||||
if (rc)
|
||||
dev->fw_download_in_progress = false;
|
||||
}
|
||||
|
||||
dev->fw_download_in_progress = true;
|
||||
rc = dev->ops->fw_download(dev, firmware_name);
|
||||
if (rc)
|
||||
dev->fw_download_in_progress = false;
|
||||
|
||||
error:
|
||||
device_unlock(&dev->dev);
|
||||
return rc;
|
||||
device_unlock(&dev->dev);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in a new issue