Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (27 commits)
  pktgen: make sure that pktgen_thread_worker has been executed
  [VLAN]: Propagate selected feature bits to VLAN devices
  drivers/atm/: remove CVS keywords
  vlan: Correctly handle device notifications for layered VLAN devices
  net: Fix call to ->change_rx_flags(dev, IFF_MULTICAST) in dev_change_flags()
  net_sched: cls_api: fix return value for non-existant classifiers
  ipsec: Use the correct ip_local_out function
  ipv6 addrconf: Allow infinite prefix lifetime.
  ipv6 route: Fix lifetime in netlink.
  ipv6 addrconf: Fix route lifetime setting in corner case.
  ndisc: Add missing strategies for per-device retrans timer/reachable time settings.
  ipv6: Move <linux/in6.h> from header-y to unifdef-y.
  l2tp: avoid skb truesize bug if headroom is increased
  wireless: Create 'device' symlink in sysfs
  wireless, airo: waitbusy() won't delay
  libertas: fix command timeout after firmware failure
  mac80211: Add RTNL version of ieee80211_iterate_active_interfaces
  mac80211 : Association with 11n hidden ssid ap.
  hostap: fix "registers" registration in procfs
  isdn/capi: Return proper errnos on module init.
  ...

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/isdn/capi/capiutil.c b/drivers/isdn/capi/capiutil.c
index ebef4ce1b00c..29419a8d31dc 100644
--- a/drivers/isdn/capi/capiutil.c
+++ b/drivers/isdn/capi/capiutil.c
@@ -948,17 +948,17 @@ int __init cdebug_init(void)
 {
         g_cmsg= kmalloc(sizeof(_cmsg), GFP_KERNEL);
         if (!g_cmsg)
-                return ENOMEM;
+                return -ENOMEM;
         g_debbuf = kmalloc(sizeof(_cdebbuf), GFP_KERNEL);
         if (!g_debbuf) {
                 kfree(g_cmsg);
-                return ENOMEM;
+                return -ENOMEM;
         }
         g_debbuf->buf = kmalloc(CDEBUG_GSIZE, GFP_KERNEL);
         if (!g_debbuf->buf) {
                 kfree(g_cmsg);
                 kfree(g_debbuf);
-                return ENOMEM;;
+                return -ENOMEM;;
         }
         g_debbuf->size = CDEBUG_GSIZE;
         g_debbuf->buf[0] = 0;