← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise-security

« back to all changes in this revision

Viewing changes to drivers/net/wireless/orinoco/fw.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati
  • Date: 2011-12-06 15:56:07 UTC
  • Revision ID: package-import@ubuntu.com-20111206155607-pcf44kv5fmhk564f
Tags: 3.2.0-1401.1
[ Paolo Pisati ]

* Rebased on top of Ubuntu-3.2.0-3.8
* Tilt-tracking @ ef2487af4bb15bdd0689631774b5a5e3a59f74e2
* Delete debian.ti-omap4/control, it shoudln't be tracked
* Fix architecture spelling (s/armel/armhf/)
* [Config] Update configs following 3.2 import
* [Config] Fix compilation: disable CODA and ARCH_OMAP3
* [Config] Fix compilation: disable Ethernet Faraday
* Update series to precise

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/wireless/orinoco/fw.c
6
6
#include <linux/slab.h>
7
7
#include <linux/firmware.h>
8
8
#include <linux/device.h>
 
9
#include <linux/module.h>
9
10
 
10
11
#include "hermes.h"
11
12
#include "hermes_dld.h"
100
101
        /* Plug Data Area (PDA) */
101
102
        __le16 *pda;
102
103
 
103
 
        hermes_t *hw = &priv->hw;
 
104
        struct hermes *hw = &priv->hw;
104
105
        const struct firmware *fw_entry;
105
106
        const struct orinoco_fw_header *hdr;
106
107
        const unsigned char *first_block;
205
206
                const unsigned char *image, const void *end,
206
207
                int secondary)
207
208
{
208
 
        hermes_t *hw = &priv->hw;
 
209
        struct hermes *hw = &priv->hw;
209
210
        int ret = 0;
210
211
        const unsigned char *ptr;
211
212
        const unsigned char *first_block;
322
323
                              fw_entry->data + fw_entry->size, 1);
323
324
        if (!orinoco_cached_fw_get(priv, false))
324
325
                release_firmware(fw_entry);
325
 
        if (ret) {
 
326
        if (ret)
326
327
                dev_err(dev, "Secondary firmware download failed\n");
327
 
        }
328
328
 
329
329
        return ret;
330
330
}