Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317279
b: refs/heads/master
c: cf66823
h: refs/heads/master
i:
  317277: d671d47
  317275: 4caed64
  317271: 7e22aea
  317263: 668df9e
  317247: fb5d0a5
v: v3
  • Loading branch information
Devendra Naga authored and Greg Kroah-Hartman committed Jun 12, 2012
1 parent 3db7b82 commit 11cae59
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8aac4d443980a4b5833b6896169c30d22e4cce74
refs/heads/master: cf66823dd224294f40ad6ddced70e80bae940741
10 changes: 6 additions & 4 deletions trunk/drivers/staging/wlan-ng/prism2fw.c
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ static int read_cardpda(struct pda *pda, wlandevice_t *wlandev);
static int mkpdrlist(struct pda *pda);

static int plugimage(struct imgchunk *fchunk, unsigned int nfchunks,
struct s3plugrec *s3plug, unsigned int ns3plug, struct pda * pda);
struct s3plugrec *s3plug, unsigned int ns3plug, struct pda *pda);

static int crcimage(struct imgchunk *fchunk, unsigned int nfchunks,
struct s3crcrec *s3crc, unsigned int ns3crc);
Expand Down Expand Up @@ -207,7 +207,8 @@ int prism2_fwtry(struct usb_device *udev, wlandevice_t *wlandev)

printk(KERN_INFO "prism2_usb: Checking for firmware %s\n",
PRISM2_USB_FWFILE);
if (request_ihex_firmware(&fw_entry, PRISM2_USB_FWFILE, &udev->dev) != 0) {
if (request_ihex_firmware(&fw_entry,
PRISM2_USB_FWFILE, &udev->dev) != 0) {
printk(KERN_INFO
"prism2_usb: Firmware not available, but not essential\n");
printk(KERN_INFO
Expand Down Expand Up @@ -593,7 +594,8 @@ int mkpdrlist(struct pda *pda)
le16_to_cpu(pda16[curroff + 1]) != HFA384x_PDR_END_OF_PDA) {
pda->rec[pda->nrec] = (hfa384x_pdrec_t *) &(pda16[curroff]);

if (le16_to_cpu(pda->rec[pda->nrec]->code) == HFA384x_PDR_NICID) {
if (le16_to_cpu(pda->rec[pda->nrec]->code) ==
HFA384x_PDR_NICID) {
memcpy(&nicid, &pda->rec[pda->nrec]->data.nicid,
sizeof(nicid));
nicid.id = le16_to_cpu(nicid.id);
Expand Down Expand Up @@ -655,7 +657,7 @@ int mkpdrlist(struct pda *pda)
* ~0 failure
----------------------------------------------------------------*/
int plugimage(struct imgchunk *fchunk, unsigned int nfchunks,
struct s3plugrec *s3plug, unsigned int ns3plug, struct pda * pda)
struct s3plugrec *s3plug, unsigned int ns3plug, struct pda *pda)
{
int result = 0;
int i; /* plug index */
Expand Down

0 comments on commit 11cae59

Please sign in to comment.