Update to natty (2.6.38-5)

1 files changed, 19 insertions, 15 deletions

diff --git a/usr/src/dkms_source_tree/hid-apple.c b/usr/src/dkms_source_tree/hid-apple.c
index 9a5f485..61aa712 100644
--- a/usr/src/dkms_source_tree/hid-apple.c
+++ b/usr/src/dkms_source_tree/hid-apple.c
@@ -16,6 +16,8 @@
  * any later version.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/device.h>
 #include <linux/hid.h>
 #include <linux/module.h>
@@ -167,7 +169,7 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
                 struct hid_usage *usage, __s32 value)
 {
         struct apple_sc *asc = hid_get_drvdata(hid);
-        const struct apple_key_translation *trans;
+        const struct apple_key_translation *trans, *table;
 
         if (usage->code == KEY_FN) {
                 asc->fn_on = !!value;
@@ -178,14 +180,16 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
         if (fnmode) {
                 int do_translate;
 
-                if(hid->product >= 0x023f && hid->product <= 0x0244 ) {
-                        trans = apple_find_translation(macbookair_fn_keys, usage->code);
-                } else {
-                        trans = apple_find_translation((hid->product < 0x21d ||
-                                        hid->product >= 0x300) ?
-                                        powerbook_fn_keys : apple_fn_keys,
-                                        usage->code);
-                }
+                if (hid->product >= USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI &&
+                                hid->product <= USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS)
+                        table = macbookair_fn_keys;
+                else if (hid->product < 0x21d || hid->product >= 0x300)
+                        table = powerbook_fn_keys;
+                else
+                        table = apple_fn_keys;
+
+                trans = apple_find_translation (table, usage->code);
+
                 if (trans) {
                         if (test_bit(usage->code, asc->pressed_fn))
                                 do_translate = 1;
@@ -278,8 +282,8 @@ static __u8 *apple_report_fixup(struct hid_device *hdev, __u8 *rdesc,
 
         if ((asc->quirks & APPLE_RDESC_JIS) && *rsize >= 60 &&
                         rdesc[53] == 0x65 && rdesc[59] == 0x65) {
-                dev_info(&hdev->dev, "fixing up MacBook JIS keyboard report "
-                                "descriptor\n");
+                hid_info(hdev,
+                         "fixing up MacBook JIS keyboard report descriptor\n");
                 rdesc[53] = rdesc[59] = 0xe7;
         }
         return rdesc;
@@ -349,7 +353,7 @@ static int apple_probe(struct hid_device *hdev,
 
         asc = kzalloc(sizeof(*asc), GFP_KERNEL);
         if (asc == NULL) {
-                dev_err(&hdev->dev, "can't alloc apple descriptor\n");
+                hid_err(hdev, "can't alloc apple descriptor\n");
                 return -ENOMEM;
         }
 
@@ -359,7 +363,7 @@ static int apple_probe(struct hid_device *hdev,
 
         ret = hid_parse(hdev);
         if (ret) {
-                dev_err(&hdev->dev, "parse failed\n");
+                hid_err(hdev, "parse failed\n");
                 goto err_free;
         }
 
@@ -370,7 +374,7 @@ static int apple_probe(struct hid_device *hdev,
 
         ret = hid_hw_start(hdev, connect_mask);
         if (ret) {
-                dev_err(&hdev->dev, "hw start failed\n");
+                hid_err(hdev, "hw start failed\n");
                 goto err_free;
         }
 
@@ -510,7 +514,7 @@ static int __init apple_init(void)
 
         ret = hid_register_driver(&apple_driver);
         if (ret)
-                printk(KERN_ERR "can't register apple driver\n");
+                pr_err("can't register apple driver\n");
 
         return ret;
 }