aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/net/pegasus.c
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2006-11-22 09:57:56 -0500
committerDavid Howells <dhowells@redhat.com>2006-11-22 09:57:56 -0500
commitc4028958b6ecad064b1a6303a6a5906d4fe48d73 (patch)
tree1c4c89652c62a75da09f9b9442012007e4ac6250 /drivers/usb/net/pegasus.c
parent65f27f38446e1976cc98fd3004b110fedcddd189 (diff)
WorkStruct: make allyesconfig
Fix up for make allyesconfig. Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'drivers/usb/net/pegasus.c')
-rw-r--r--drivers/usb/net/pegasus.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/net/pegasus.c b/drivers/usb/net/pegasus.c
index 33abbd2176b6..78cf6f091285 100644
--- a/drivers/usb/net/pegasus.c
+++ b/drivers/usb/net/pegasus.c
@@ -1280,9 +1280,9 @@ static inline void setup_pegasus_II(pegasus_t * pegasus)
1280static struct workqueue_struct *pegasus_workqueue = NULL; 1280static struct workqueue_struct *pegasus_workqueue = NULL;
1281#define CARRIER_CHECK_DELAY (2 * HZ) 1281#define CARRIER_CHECK_DELAY (2 * HZ)
1282 1282
1283static void check_carrier(void *data) 1283static void check_carrier(struct work_struct *work)
1284{ 1284{
1285 pegasus_t *pegasus = data; 1285 pegasus_t *pegasus = container_of(work, pegasus_t, carrier_check.work);
1286 set_carrier(pegasus->net); 1286 set_carrier(pegasus->net);
1287 if (!(pegasus->flags & PEGASUS_UNPLUG)) { 1287 if (!(pegasus->flags & PEGASUS_UNPLUG)) {
1288 queue_delayed_work(pegasus_workqueue, &pegasus->carrier_check, 1288 queue_delayed_work(pegasus_workqueue, &pegasus->carrier_check,
@@ -1318,7 +1318,7 @@ static int pegasus_probe(struct usb_interface *intf,
1318 1318
1319 tasklet_init(&pegasus->rx_tl, rx_fixup, (unsigned long) pegasus); 1319 tasklet_init(&pegasus->rx_tl, rx_fixup, (unsigned long) pegasus);
1320 1320
1321 INIT_WORK(&pegasus->carrier_check, check_carrier, pegasus); 1321 INIT_DELAYED_WORK(&pegasus->carrier_check, check_carrier);
1322 1322
1323 pegasus->intf = intf; 1323 pegasus->intf = intf;
1324 pegasus->usb = dev; 1324 pegasus->usb = dev;