diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-07-20 15:42:02 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-07-20 15:42:02 +1000 |
| commit | 69a56393eebb5baf497982e003eb55147b8fc692 (patch) | |
| tree | a7d4eb8c7d98543abae7c886959b4c6bbbe58e2f /drivers/staging/wlan-ng/prism2usb.c | |
| parent | cdb51fe7ee5b375941b28f54111bfc62d0c070d6 (diff) | |
| parent | 1254bb7e86b4f71b149a8741f3b2afd7cb0b3459 (diff) | |
Merge branch 'quilt/staging'
Diffstat (limited to 'drivers/staging/wlan-ng/prism2usb.c')
| -rw-r--r-- | drivers/staging/wlan-ng/prism2usb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/wlan-ng/prism2usb.c b/drivers/staging/wlan-ng/prism2usb.c index 7aa703ce9dd4..9dde68be8d74 100644 --- a/drivers/staging/wlan-ng/prism2usb.c +++ b/drivers/staging/wlan-ng/prism2usb.c @@ -4,9 +4,9 @@ #include "prism2sta.c" #include "prism2fw.c" -#define PRISM_USB_DEVICE(vid, pid, name) \ - USB_DEVICE(vid, pid), \ - .driver_info = (unsigned long) name +#define PRISM_USB_DEVICE(vid, pid, name) \ + USB_DEVICE(vid, pid), \ + .driver_info = (unsigned long) name static struct usb_device_id usb_prism_tbl[] = { {PRISM_USB_DEVICE(0x04bb, 0x0922, "IOData AirPort WN-B11/USBS")}, @@ -111,8 +111,8 @@ static int prism2sta_probe_usb(struct usb_interface *interface, int result = 0; dev = interface_to_usbdev(interface); - - if ((wlandev = create_wlan()) == NULL) { + wlandev = create_wlan(); + if (wlandev == NULL) { printk(KERN_ERR "%s: Memory allocation failure.\n", dev_info); result = -EIO; goto failed; |