Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 36531
b: refs/heads/master
c: bc5f06a
h: refs/heads/master
i:
  36529: 1d0dd16
  36527: fd7e252
v: v3
  • Loading branch information
Ulrich Kunitz authored and John W. Linville committed Sep 25, 2006
1 parent 98f4a95 commit 1470f28
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 44976c66bb2b44e4cf29a259a0cd6adadf8eb031
refs/heads/master: bc5f06a8aaa29a79c9da2cedb5b9779b8081289c
10 changes: 10 additions & 0 deletions trunk/drivers/net/wireless/zd1211rw/zd_usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <linux/errno.h>
#include <linux/skbuff.h>
#include <linux/usb.h>
#include <linux/workqueue.h>
#include <net/ieee80211.h>

#include "zd_def.h"
Expand Down Expand Up @@ -1112,12 +1113,20 @@ static struct usb_driver driver = {
.disconnect = disconnect,
};

struct workqueue_struct *zd_workqueue;

static int __init usb_init(void)
{
int r;

pr_debug("usb_init()\n");

zd_workqueue = create_singlethread_workqueue(driver.name);
if (zd_workqueue == NULL) {
printk(KERN_ERR "%s: couldn't create workqueue\n", driver.name);
return -ENOMEM;
}

r = usb_register(&driver);
if (r) {
printk(KERN_ERR "usb_register() failed. Error number %d\n", r);
Expand All @@ -1132,6 +1141,7 @@ static void __exit usb_exit(void)
{
pr_debug("usb_exit()\n");
usb_deregister(&driver);
destroy_workqueue(zd_workqueue);
}

module_init(usb_init);
Expand Down
2 changes: 2 additions & 0 deletions trunk/drivers/net/wireless/zd1211rw/zd_usb.h
Original file line number Diff line number Diff line change
Expand Up @@ -238,4 +238,6 @@ int zd_usb_iowrite16v(struct zd_usb *usb, const struct zd_ioreq16 *ioreqs,

int zd_usb_rfwrite(struct zd_usb *usb, u32 value, u8 bits);

extern struct workqueue_struct *zd_workqueue;

#endif /* _ZD_USB_H */

0 comments on commit 1470f28

Please sign in to comment.