]> Devoid-pointer.net GitWeb - omnibook.git/commitdiff
nbsmi.c Fixed NULL-pointer-dereference in omnibook_handle_fnkey: Pass priv_data...
authorHolger Nelson <hnelson@hnelson.de>
Fri, 12 Jan 2007 02:02:10 +0000 (02:02 +0000)
committerHolger Nelson <hnelson@hnelson.de>
Fri, 12 Jan 2007 02:02:10 +0000 (02:02 +0000)
debian/rules compatibility-fix for Ubuntu: Use DEPMOD="/bin/true" instead of DEPMOD="" during install.

debian/rules
nbsmi.c

index 10854c5b80eadea674126b53c5d9708a45e71ed4..645f18d044dab51c728a42ee1dd1e4b8e355dbeb 100755 (executable)
@@ -118,7 +118,7 @@ binary-modules: kdist_config prep-deb-files
        $(MAKE) KSRC=$(KSRC) KVERS=$(KVERS)
 
        # Install the module
-       $(MAKE) install KSRC=$(KSRC) DESTDIR=$(CURDIR)/debian/$(PKGNAME) INSTDIR=extra DEPMOD=""
+       $(MAKE) install KSRC=$(KSRC) DESTDIR=$(CURDIR)/debian/$(PKGNAME) INSTDIR=extra DEPMOD="/bin/true"
 
        dh_installdocs
        dh_compress
diff --git a/nbsmi.c b/nbsmi.c
index bef719c19122bf5a582cca95e1c430e832b78382..661cbc26c44b8fb89578643aa6859a663a348b1b 100644 (file)
--- a/nbsmi.c
+++ b/nbsmi.c
@@ -467,7 +467,7 @@ static int register_input_subsystem(struct nbsmi_backend_data *priv_data)
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19))
        INIT_WORK(&priv_data->fnkey_work, *omnibook_handle_fnkey);
 #else
-       INIT_WORK(&priv_data->fnkey_work, *omnibook_handle_fnkey, NULL);
+       INIT_WORK(&priv_data->fnkey_work, *omnibook_handle_fnkey, priv_data);
 #endif