diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-07-30 13:38:04 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-07-30 13:38:04 -0400 |
| commit | 2e6713c7662cc5ebc7346b033c404cb2f708fd51 (patch) | |
| tree | 8492ea548fea2d8243e4af4b877906afc4e32783 /drivers/base/firmware_class.c | |
| parent | b4093d6235b7e4249616651ee328600ced48a18a (diff) | |
| parent | 658874f05d040ca96eb5ba9b1c30ce0ff287d762 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/base/firmware_class.c')
| -rw-r--r-- | drivers/base/firmware_class.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index f285f441fab9..7376367bcb80 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c | |||
| @@ -180,7 +180,6 @@ static ssize_t firmware_loading_store(struct device *dev, | |||
| 180 | goto err; | 180 | goto err; |
| 181 | } | 181 | } |
| 182 | /* Pages will be freed by vfree() */ | 182 | /* Pages will be freed by vfree() */ |
| 183 | fw_priv->pages = NULL; | ||
| 184 | fw_priv->page_array_size = 0; | 183 | fw_priv->page_array_size = 0; |
| 185 | fw_priv->nr_pages = 0; | 184 | fw_priv->nr_pages = 0; |
| 186 | complete(&fw_priv->completion); | 185 | complete(&fw_priv->completion); |