From eb4d2050f70d3f2322d86bc277f9e82f8b72039a Mon Sep 17 00:00:00 2001 From: Andrey Borzenkov Date: Wed, 21 Jan 2009 21:55:29 +0300 Subject: [PATCH] --- yaml --- r: 134207 b: refs/heads/master c: e129a948c906200db87727822559c09b62278824 h: refs/heads/master i: 134205: 1fdfa11ba20392f8febe3dcc55939b8ab5cf30bd 134203: 57d6aab9710b1b16d779cefdb6a18316a3d384b1 134199: c460594a48e6256b587a6152038360aa27867da4 134191: ed3acb42474cd4bc5a7b5221be9762136f7f08b5 134175: 4c400d26d0f17bcf6bec86f1f2b66a39e3572bc2 134143: 2deca3f9b4451835de73b0c06a5e5634ccb3e279 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/orinoco/orinoco.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 213289296111..9fe953d89870 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 89ea40905fb48e2bf92211b57ab6be51c0797657 +refs/heads/master: e129a948c906200db87727822559c09b62278824 diff --git a/trunk/drivers/net/wireless/orinoco/orinoco.c b/trunk/drivers/net/wireless/orinoco/orinoco.c index 05c157698db8..6514e4611b96 100644 --- a/trunk/drivers/net/wireless/orinoco/orinoco.c +++ b/trunk/drivers/net/wireless/orinoco/orinoco.c @@ -3604,7 +3604,7 @@ struct net_device struct orinoco_private *priv; dev = alloc_etherdev(sizeof(struct orinoco_private) + sizeof_card); - if (! dev) + if (!dev) return NULL; priv = netdev_priv(dev); priv->ndev = dev; @@ -3619,7 +3619,7 @@ struct net_device dev->netdev_ops = &orinoco_netdev_ops; dev->watchdog_timeo = HZ; /* 1 second timeout */ dev->ethtool_ops = &orinoco_ethtool_ops; - dev->wireless_handlers = (struct iw_handler_def *)&orinoco_handler_def; + dev->wireless_handlers = &orinoco_handler_def; #ifdef WIRELESS_SPY priv->wireless_data.spy_data = &priv->spy_data; dev->wireless_data = &priv->wireless_data;