The patch titled
via-pmu: add input device (update)
has been added to the -mm tree. Its filename is
via-pmu-add-input-device-update.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: via-pmu: add input device (update)
From: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
unchangelogged updates.
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Cc: Pavel Machek <pavel@xxxxxxx>
Cc: Richard Purdie <rpurdie@xxxxxxxxx>
Cc: Matthew Garrett <mjg59@xxxxxxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Cc: <linux-input@xxxxxxxxxxxxxxxxxxxxxxxx>
Cc: Dmitry Torokhov <dtor_core@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/macintosh/via-pmu-event.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff -puN drivers/macintosh/via-pmu-event.c~via-pmu-add-input-device-update drivers/macintosh/via-pmu-event.c
--- devel/drivers/macintosh/via-pmu-event.c~via-pmu-add-input-device-update 2006-06-08 17:38:44.000000000 -0700
+++ devel-akpm/drivers/macintosh/via-pmu-event.c 2006-06-08 17:38:44.000000000 -0700
@@ -29,13 +29,15 @@ static struct input_dev *pmu_input_dev;
static int __init via_pmu_event_init(void)
{
+ int err;
+
/* do other models report button/lid status? */
if (pmu_get_model() != PMU_KEYLARGO_BASED)
return -ENODEV;
pmu_input_dev = input_allocate_device();
if (!pmu_input_dev)
- return -ENODEV;
+ return -ENOMEM;
pmu_input_dev->name = "PMU";
pmu_input_dev->id.bustype = BUS_HOST;
@@ -48,7 +50,10 @@ static int __init via_pmu_event_init(voi
set_bit(KEY_POWER, pmu_input_dev->keybit);
set_bit(SW_LID, pmu_input_dev->swbit);
- return input_register_device(pmu_input_dev);
+ err = input_register_device(pmu_input_dev);
+ if (err)
+ input_free_device(pmu_input_dev);
+ return err;
}
void via_pmu_event(int key, int down)
_
Patches currently in -mm which might be from johannes@xxxxxxxxxxxxxxxx are
via-pmu-add-input-device.patch
via-pmu-add-input-device-update.patch
git-netdev-all.patch
apple-motion-sensor-driver.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
