diff options
26 files changed, 47 insertions, 2054 deletions
diff --git a/driver-core.current/driver-core-add-device_create_vargs-and-device_create_drvdata.patch b/driver-core.current/driver-core-add-device_create_vargs-and-device_create_drvdata.patch deleted file mode 100644 index 8b6a95040d2c30..00000000000000 --- a/driver-core.current/driver-core-add-device_create_vargs-and-device_create_drvdata.patch +++ /dev/null @@ -1,172 +0,0 @@ -From foo@baz Tue Apr 9 12:12:43 2002 -Date: Thu, 15 May 2008 13:44:08 -0700 -To: Greg KH <greg@kroah.com> -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: Driver core: add device_create_vargs and device_create_drvdata - -From: Greg Kroah-Hartman <gregkh@suse.de> - -We want to have the drvdata field set properly when creating the device -as sysfs callbacks can assume it is present and it can race the later -setting of this field. - -So, create two new functions, deviec_create_vargs() and -device_create_drvdata() that take this new field. - -device_create_drvdata() will go away in 2.6.27 as the drvdata field will -just be moved to the device_create() call as it should be. - -Cc: Kay Sievers <kay.sievers@vrfy.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/base/core.c | 85 +++++++++++++++++++++++++++++++++++++++++++++---- - include/linux/device.h | 12 ++++++ - 2 files changed, 91 insertions(+), 6 deletions(-) - ---- a/drivers/base/core.c -+++ b/drivers/base/core.c -@@ -1084,11 +1084,13 @@ static void device_create_release(struct - } - - /** -- * device_create - creates a device and registers it with sysfs -+ * device_create_vargs - creates a device and registers it with sysfs - * @class: pointer to the struct class that this device should be registered to - * @parent: pointer to the parent struct device of this new device, if any - * @devt: the dev_t for the char device to be added -+ * @drvdata: the data to be added to the device for callbacks - * @fmt: string for the device's name -+ * @args: va_list for the device's name - * - * This function can be used by char device classes. A struct device - * will be created in sysfs, registered to the specified class. -@@ -1104,10 +1106,10 @@ static void device_create_release(struct - * Note: the struct class passed to this function must have previously - * been created with a call to class_create(). - */ --struct device *device_create(struct class *class, struct device *parent, -- dev_t devt, const char *fmt, ...) -+struct device *device_create_vargs(struct class *class, struct device *parent, -+ dev_t devt, void *drvdata, const char *fmt, -+ va_list args) - { -- va_list args; - struct device *dev = NULL; - int retval = -ENODEV; - -@@ -1124,10 +1126,9 @@ struct device *device_create(struct clas - dev->class = class; - dev->parent = parent; - dev->release = device_create_release; -+ dev_set_drvdata(dev, drvdata); - -- va_start(args, fmt); - vsnprintf(dev->bus_id, BUS_ID_SIZE, fmt, args); -- va_end(args); - retval = device_register(dev); - if (retval) - goto error; -@@ -1138,6 +1139,78 @@ error: - kfree(dev); - return ERR_PTR(retval); - } -+EXPORT_SYMBOL_GPL(device_create_vargs); -+ -+/** -+ * device_create_drvdata - creates a device and registers it with sysfs -+ * @class: pointer to the struct class that this device should be registered to -+ * @parent: pointer to the parent struct device of this new device, if any -+ * @devt: the dev_t for the char device to be added -+ * @drvdata: the data to be added to the device for callbacks -+ * @fmt: string for the device's name -+ * -+ * This function can be used by char device classes. A struct device -+ * will be created in sysfs, registered to the specified class. -+ * -+ * A "dev" file will be created, showing the dev_t for the device, if -+ * the dev_t is not 0,0. -+ * If a pointer to a parent struct device is passed in, the newly created -+ * struct device will be a child of that device in sysfs. -+ * The pointer to the struct device will be returned from the call. -+ * Any further sysfs files that might be required can be created using this -+ * pointer. -+ * -+ * Note: the struct class passed to this function must have previously -+ * been created with a call to class_create(). -+ */ -+struct device *device_create_drvdata(struct class *class, -+ struct device *parent, -+ dev_t devt, -+ void *drvdata, -+ const char *fmt, ...) -+{ -+ va_list vargs; -+ struct device *dev; -+ -+ va_start(vargs, fmt); -+ dev = device_create_vargs(class, parent, devt, drvdata, fmt, vargs); -+ va_end(vargs); -+ return dev; -+} -+EXPORT_SYMBOL_GPL(device_create_drvdata); -+ -+/** -+ * device_create - creates a device and registers it with sysfs -+ * @class: pointer to the struct class that this device should be registered to -+ * @parent: pointer to the parent struct device of this new device, if any -+ * @devt: the dev_t for the char device to be added -+ * @fmt: string for the device's name -+ * -+ * This function can be used by char device classes. A struct device -+ * will be created in sysfs, registered to the specified class. -+ * -+ * A "dev" file will be created, showing the dev_t for the device, if -+ * the dev_t is not 0,0. -+ * If a pointer to a parent struct device is passed in, the newly created -+ * struct device will be a child of that device in sysfs. -+ * The pointer to the struct device will be returned from the call. -+ * Any further sysfs files that might be required can be created using this -+ * pointer. -+ * -+ * Note: the struct class passed to this function must have previously -+ * been created with a call to class_create(). -+ */ -+struct device *device_create(struct class *class, struct device *parent, -+ dev_t devt, const char *fmt, ...) -+{ -+ va_list vargs; -+ struct device *dev; -+ -+ va_start(vargs, fmt); -+ dev = device_create_vargs(class, parent, devt, NULL, fmt, vargs); -+ va_end(vargs); -+ return dev; -+} - EXPORT_SYMBOL_GPL(device_create); - - static int __match_devt(struct device *dev, void *data) ---- a/include/linux/device.h -+++ b/include/linux/device.h -@@ -449,9 +449,21 @@ extern int __must_check device_reprobe(s - /* - * Easy functions for dynamically creating devices on the fly - */ -+extern struct device *device_create_vargs(struct class *cls, -+ struct device *parent, -+ dev_t devt, -+ void *drvdata, -+ const char *fmt, -+ va_list vargs); - extern struct device *device_create(struct class *cls, struct device *parent, - dev_t devt, const char *fmt, ...) - __attribute__((format(printf, 4, 5))); -+extern struct device *device_create_drvdata(struct class *cls, -+ struct device *parent, -+ dev_t devt, -+ void *drvdata, -+ const char *fmt, ...) -+ __attribute__((format(printf, 5, 6))); - extern void device_destroy(struct class *cls, dev_t devt); - - /* diff --git a/driver-core.current/fbdev-fix-race-in-device_create.patch b/driver-core.current/fbdev-fix-race-in-device_create.patch deleted file mode 100644 index 7c9a3567cdf53d..00000000000000 --- a/driver-core.current/fbdev-fix-race-in-device_create.patch +++ /dev/null @@ -1,51 +0,0 @@ -From foo@baz Tue Apr 9 12:12:43 2002 -Date: Thu, 15 May 2008 13:44:08 -0700 -To: Greg KH <greg@kroah.com> -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: fbdev: fix race in device_create - -From: Greg Kroah-Hartman <gregkh@suse.de> - -There is a race from when a device is created with device_create() and -then the drvdata is set with a call to dev_set_drvdata() in which a -sysfs file could be open, yet the drvdata will be NULL, causing all -sorts of bad things to happen. - -This patch fixes the problem by using the new function, -device_create_drvdata(). - -Cc: Kay Sievers <kay.sievers@vrfy.org> -Cc: James Simmons <jsimmons@infradead.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/video/display/display-sysfs.c | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - ---- a/drivers/video/display/display-sysfs.c -+++ b/drivers/video/display/display-sysfs.c -@@ -26,6 +26,7 @@ - #include <linux/ctype.h> - #include <linux/idr.h> - #include <linux/err.h> -+#include <linux/kdev_t.h> - - static ssize_t display_show_name(struct device *dev, - struct device_attribute *attr, char *buf) -@@ -152,10 +153,13 @@ struct display_device *display_device_re - mutex_unlock(&allocated_dsp_lock); - - if (!ret) { -- new_dev->dev = device_create(display_class, parent, 0, -- "display%d", new_dev->idx); -+ new_dev->dev = device_create_drvdata(display_class, -+ parent, -+ MKDEV(0,0), -+ new_dev, -+ "display%d", -+ new_dev->idx); - if (!IS_ERR(new_dev->dev)) { -- dev_set_drvdata(new_dev->dev, new_dev); - new_dev->parent = parent; - new_dev->driver = driver; - mutex_init(&new_dev->lock); diff --git a/driver-core.current/ib-fix-race-in-device_create.patch b/driver-core.current/ib-fix-race-in-device_create.patch deleted file mode 100644 index 488ef7d16b9ddf..00000000000000 --- a/driver-core.current/ib-fix-race-in-device_create.patch +++ /dev/null @@ -1,82 +0,0 @@ -From foo@baz Tue Apr 9 12:12:43 2002 -Date: Fri, 16 May 2008 17:55:12 -0700 -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: IB: fix race in device_create - -From: Greg Kroah-Hartman <gregkh@suse.de> - -There is a race from when a device is created with device_create() and -then the drvdata is set with a call to dev_set_drvdata() in which a -sysfs file could be open, yet the drvdata will be NULL, causing all -sorts of bad things to happen. - -This patch fixes the problem by using the new function, -device_create_drvdata(). - -Cc: Kay Sievers <kay.sievers@vrfy.org> -Reviewed-by: Roland Dreier <rolandd@cisco.com> -Cc: Sean Hefty <sean.hefty@intel.com> -Cc: Hal Rosenstock <hal.rosenstock@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/infiniband/core/user_mad.c | 14 ++++++-------- - drivers/infiniband/core/uverbs_main.c | 11 ++++++----- - 2 files changed, 12 insertions(+), 13 deletions(-) - ---- a/drivers/infiniband/core/user_mad.c -+++ b/drivers/infiniband/core/user_mad.c -@@ -1005,8 +1005,9 @@ static int ib_umad_init_port(struct ib_d - if (cdev_add(port->cdev, base_dev + port->dev_num, 1)) - goto err_cdev; - -- port->dev = device_create(umad_class, device->dma_device, -- port->cdev->dev, "umad%d", port->dev_num); -+ port->dev = device_create_drvdata(umad_class, device->dma_device, -+ port->cdev->dev, port, -+ "umad%d", port->dev_num); - if (IS_ERR(port->dev)) - goto err_cdev; - -@@ -1024,15 +1025,12 @@ static int ib_umad_init_port(struct ib_d - if (cdev_add(port->sm_cdev, base_dev + port->dev_num + IB_UMAD_MAX_PORTS, 1)) - goto err_sm_cdev; - -- port->sm_dev = device_create(umad_class, device->dma_device, -- port->sm_cdev->dev, -- "issm%d", port->dev_num); -+ port->sm_dev = device_create_drvdata(umad_class, device->dma_device, -+ port->sm_cdev->dev, port, -+ "issm%d", port->dev_num); - if (IS_ERR(port->sm_dev)) - goto err_sm_cdev; - -- dev_set_drvdata(port->dev, port); -- dev_set_drvdata(port->sm_dev, port); -- - if (device_create_file(port->sm_dev, &dev_attr_ibdev)) - goto err_sm_dev; - if (device_create_file(port->sm_dev, &dev_attr_port)) ---- a/drivers/infiniband/core/uverbs_main.c -+++ b/drivers/infiniband/core/uverbs_main.c -@@ -755,14 +755,15 @@ static void ib_uverbs_add_one(struct ib_ - if (cdev_add(uverbs_dev->cdev, IB_UVERBS_BASE_DEV + uverbs_dev->devnum, 1)) - goto err_cdev; - -- uverbs_dev->dev = device_create(uverbs_class, device->dma_device, -- uverbs_dev->cdev->dev, -- "uverbs%d", uverbs_dev->devnum); -+ uverbs_dev->dev = device_create_drvdata(uverbs_class, -+ device->dma_device, -+ uverbs_dev->cdev->dev, -+ uverbs_dev, -+ "uverbs%d", -+ uverbs_dev->devnum); - if (IS_ERR(uverbs_dev->dev)) - goto err_cdev; - -- dev_set_drvdata(uverbs_dev->dev, uverbs_dev); -- - if (device_create_file(uverbs_dev->dev, &dev_attr_ibdev)) - goto err_class; - if (device_create_file(uverbs_dev->dev, &dev_attr_abi_version)) diff --git a/driver-core.current/ide-fix-race-in-device_create.patch b/driver-core.current/ide-fix-race-in-device_create.patch deleted file mode 100644 index fdb17f662f6e95..00000000000000 --- a/driver-core.current/ide-fix-race-in-device_create.patch +++ /dev/null @@ -1,41 +0,0 @@ -From foo@baz Tue Apr 9 12:12:43 2002 -Date: Fri, 16 May 2008 17:55:12 -0700 -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: ide: fix race in device_create - -From: Greg Kroah-Hartman <gregkh@suse.de> - -There is a race from when a device is created with device_create() and -then the drvdata is set with a call to dev_set_drvdata() in which a -sysfs file could be open, yet the drvdata will be NULL, causing all -sorts of bad things to happen. - -This patch fixes the problem by using the new function, -device_create_drvdata(). - -Cc: Kay Sievers <kay.sievers@vrfy.org> -Acked-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/ide/ide-probe.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - ---- a/drivers/ide/ide-probe.c -+++ b/drivers/ide/ide-probe.c -@@ -648,13 +648,12 @@ static int ide_register_port(ide_hwif_t - - get_device(&hwif->gendev); - -- hwif->portdev = device_create(ide_port_class, &hwif->gendev, -- MKDEV(0, 0), hwif->name); -+ hwif->portdev = device_create_drvdata(ide_port_class, &hwif->gendev, -+ MKDEV(0, 0), hwif, hwif->name); - if (IS_ERR(hwif->portdev)) { - ret = PTR_ERR(hwif->portdev); - device_unregister(&hwif->gendev); - } -- dev_set_drvdata(hwif->portdev, hwif); - out: - return ret; - } diff --git a/driver-core.current/leds-fix-race-in-device_create.patch b/driver-core.current/leds-fix-race-in-device_create.patch deleted file mode 100644 index ad707e59b09b43..00000000000000 --- a/driver-core.current/leds-fix-race-in-device_create.patch +++ /dev/null @@ -1,41 +0,0 @@ -From foo@baz Tue Apr 9 12:12:43 2002 -Date: Fri, 16 May 2008 17:55:12 -0700 -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: LEDS: fix race in device_create - -From: Greg Kroah-Hartman <gregkh@suse.de> - -There is a race from when a device is created with device_create() and -then the drvdata is set with a call to dev_set_drvdata() in which a -sysfs file could be open, yet the drvdata will be NULL, causing all -sorts of bad things to happen. - -This patch fixes the problem by using the new function, -device_create_drvdata(). - -Cc: Kay Sievers <kay.sievers@vrfy.org> -Cc: Richard Purdie <rpurdie@rpsys.net> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/leds/led-class.c | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - ---- a/drivers/leds/led-class.c -+++ b/drivers/leds/led-class.c -@@ -103,13 +103,11 @@ int led_classdev_register(struct device - { - int rc; - -- led_cdev->dev = device_create(leds_class, parent, 0, "%s", -- led_cdev->name); -+ led_cdev->dev = device_create_drvdata(leds_class, parent, 0, led_cdev, -+ "%s", led_cdev->name); - if (IS_ERR(led_cdev->dev)) - return PTR_ERR(led_cdev->dev); - -- dev_set_drvdata(led_cdev->dev, led_cdev); -- - /* register the attributes */ - rc = device_create_file(led_cdev->dev, &dev_attr_brightness); - if (rc) diff --git a/driver-core.current/mm-bdi-fix-race-in-bdi_class-device-creation.patch b/driver-core.current/mm-bdi-fix-race-in-bdi_class-device-creation.patch deleted file mode 100644 index a7dba0e8683531..00000000000000 --- a/driver-core.current/mm-bdi-fix-race-in-bdi_class-device-creation.patch +++ /dev/null @@ -1,64 +0,0 @@ -From foo@baz Tue Apr 9 12:12:43 2002 -Date: Thu, 15 May 2008 13:44:08 -0700 -To: Greg KH <greg@kroah.com> -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: mm: bdi: fix race in bdi_class device creation - -From: Greg Kroah-Hartman <gregkh@suse.de> - -There is a race from when a device is created with device_create() and -then the drvdata is set with a call to dev_set_drvdata() in which a -sysfs file could be open, yet the drvdata will be NULL, causing all -sorts of bad things to happen. - -This patch fixes the problem by using the new function, -device_create_vargs(). - -Many thanks to Arthur Jones <ajones@riverbed.com> for reporting the bug, -and testing patches out. - -Cc: Kay Sievers <kay.sievers@vrfy.org> -Cc: Arthur Jones <ajones@riverbed.com> -Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> -Cc: Miklos Szeredi <mszeredi@suse.cz> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - mm/backing-dev.c | 12 ++---------- - 1 file changed, 2 insertions(+), 10 deletions(-) - ---- a/mm/backing-dev.c -+++ b/mm/backing-dev.c -@@ -172,30 +172,22 @@ postcore_initcall(bdi_class_init); - int bdi_register(struct backing_dev_info *bdi, struct device *parent, - const char *fmt, ...) - { -- char *name; - va_list args; - int ret = 0; - struct device *dev; - - va_start(args, fmt); -- name = kvasprintf(GFP_KERNEL, fmt, args); -+ dev = device_create_vargs(bdi_class, parent, MKDEV(0, 0), bdi, fmt, args); - va_end(args); -- -- if (!name) -- return -ENOMEM; -- -- dev = device_create(bdi_class, parent, MKDEV(0, 0), name); - if (IS_ERR(dev)) { - ret = PTR_ERR(dev); - goto exit; - } - - bdi->dev = dev; -- dev_set_drvdata(bdi->dev, bdi); -- bdi_debug_register(bdi, name); -+ bdi_debug_register(bdi, dev_name(dev)); - - exit: -- kfree(name); - return ret; - } - EXPORT_SYMBOL(bdi_register); diff --git a/driver-core.current/power-supply-fix-race-in-device_create.patch b/driver-core.current/power-supply-fix-race-in-device_create.patch deleted file mode 100644 index 0a07922ffc4650..00000000000000 --- a/driver-core.current/power-supply-fix-race-in-device_create.patch +++ /dev/null @@ -1,44 +0,0 @@ -From foo@baz Tue Apr 9 12:12:43 2002 -Date: Fri, 16 May 2008 17:55:12 -0700 -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: Power Supply: fix race in device_create - -From: Greg Kroah-Hartman <gregkh@suse.de> - -There is a race from when a device is created with device_create() and -then the drvdata is set with a call to dev_set_drvdata() in which a -sysfs file could be open, yet the drvdata will be NULL, causing all -sorts of bad things to happen. - -This patch fixes the problem by using the new function, -device_create_drvdata(). - -Cc: Kay Sievers <kay.sievers@vrfy.org> -Cc: Anton Vorontsov <cbou@mail.ru> -Cc: David Woodhouse <dwmw2@infradead.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/power/power_supply_core.c | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - ---- a/drivers/power/power_supply_core.c -+++ b/drivers/power/power_supply_core.c -@@ -91,15 +91,13 @@ int power_supply_register(struct device - { - int rc = 0; - -- psy->dev = device_create(power_supply_class, parent, 0, -- "%s", psy->name); -+ psy->dev = device_create_drvdata(power_supply_class, parent, 0, -+ psy, "%s", psy->name); - if (IS_ERR(psy->dev)) { - rc = PTR_ERR(psy->dev); - goto dev_create_failed; - } - -- dev_set_drvdata(psy->dev, psy); -- - INIT_WORK(&psy->changed_work, power_supply_changed_work); - - rc = power_supply_create_attrs(psy); diff --git a/driver-core.current/s390-fix-race-in-device_create.patch b/driver-core.current/s390-fix-race-in-device_create.patch deleted file mode 100644 index 785680f90dd612..00000000000000 --- a/driver-core.current/s390-fix-race-in-device_create.patch +++ /dev/null @@ -1,50 +0,0 @@ -From foo@baz Tue Apr 9 12:12:43 2002 -Date: Fri, 16 May 2008 17:55:12 -0700 -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: s390: fix race in device_create - -From: Greg Kroah-Hartman <gregkh@suse.de> - -There is a race from when a device is created with device_create() and -then the drvdata is set with a call to dev_set_drvdata() in which a -sysfs file could be open, yet the drvdata will be NULL, causing all -sorts of bad things to happen. - -This patch fixes the problem by using the new function, -device_create_drvdata(). - -Cc: Kay Sievers <kay.sievers@vrfy.org> -Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> -Cc: Heiko Carstens <heiko.carstens@de.ibm.com> -Cc: Cornelia Huck <cornelia.huck@de.ibm.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/s390/char/vmlogrdr.c | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - ---- a/drivers/s390/char/vmlogrdr.c -+++ b/drivers/s390/char/vmlogrdr.c -@@ -762,10 +762,10 @@ static int vmlogrdr_register_device(stru - device_unregister(dev); - return ret; - } -- priv->class_device = device_create(vmlogrdr_class, dev, -- MKDEV(vmlogrdr_major, -- priv->minor_num), -- "%s", dev->bus_id); -+ priv->class_device = device_create_drvdata(vmlogrdr_class, dev, -+ MKDEV(vmlogrdr_major, -+ priv->minor_num), -+ priv, "%s", dev->bus_id); - if (IS_ERR(priv->class_device)) { - ret = PTR_ERR(priv->class_device); - priv->class_device=NULL; -@@ -773,7 +773,6 @@ static int vmlogrdr_register_device(stru - device_unregister(dev); - return ret; - } -- dev->driver_data = priv; - priv->device = dev; - return 0; - } diff --git a/driver-core.current/scsi-fix-race-in-device_create.patch b/driver-core.current/scsi-fix-race-in-device_create.patch deleted file mode 100644 index 0453dd31cf34c6..00000000000000 --- a/driver-core.current/scsi-fix-race-in-device_create.patch +++ /dev/null @@ -1,121 +0,0 @@ -From foo@baz Tue Apr 9 12:12:43 2002 -Date: Fri, 16 May 2008 17:55:12 -0700 -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: SCSI: fix race in device_create - -From: Greg Kroah-Hartman <gregkh@suse.de> - -There is a race from when a device is created with device_create() and -then the drvdata is set with a call to dev_set_drvdata() in which a -sysfs file could be open, yet the drvdata will be NULL, causing all -sorts of bad things to happen. - -This patch fixes the problem by using the new function, -device_create_drvdata(). It fixes the problem in all of the scsi -drivers that need it. - -Cc: Kay Sievers <kay.sievers@vrfy.org> -Cc: Doug Gilbert <dgilbert@interlog.com> -Cc: James E.J. Bottomley <James.Bottomley@HansenPartnership.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/scsi/ch.c | 7 +++---- - drivers/scsi/osst.c | 3 +-- - drivers/scsi/sg.c | 11 ++++++----- - drivers/scsi/st.c | 12 +++++++----- - 4 files changed, 17 insertions(+), 16 deletions(-) - ---- a/drivers/scsi/ch.c -+++ b/drivers/scsi/ch.c -@@ -910,9 +910,9 @@ static int ch_probe(struct device *dev) - ch->minor = minor; - sprintf(ch->name,"ch%d",ch->minor); - -- class_dev = device_create(ch_sysfs_class, dev, -- MKDEV(SCSI_CHANGER_MAJOR,ch->minor), -- "s%s", ch->name); -+ class_dev = device_create_drvdata(ch_sysfs_class, dev, -+ MKDEV(SCSI_CHANGER_MAJOR, ch->minor), -+ ch, "s%s", ch->name); - if (IS_ERR(class_dev)) { - printk(KERN_WARNING "ch%d: device_create failed\n", - ch->minor); -@@ -926,7 +926,6 @@ static int ch_probe(struct device *dev) - if (init) - ch_init_elem(ch); - -- dev_set_drvdata(dev, ch); - sdev_printk(KERN_INFO, sd, "Attached scsi changer %s\n", ch->name); - - return 0; ---- a/drivers/scsi/osst.c -+++ b/drivers/scsi/osst.c -@@ -5695,13 +5695,12 @@ static int osst_sysfs_add(dev_t dev, str - struct device *osst_member; - int err; - -- osst_member = device_create(osst_sysfs_class, device, dev, "%s", name); -+ osst_member = device_create_drvdata(osst_sysfs_class, device, dev, STp, "%s", name); - if (IS_ERR(osst_member)) { - printk(KERN_WARNING "osst :W: Unable to add sysfs class member %s\n", name); - return PTR_ERR(osst_member); - } - -- dev_set_drvdata(osst_member, STp); - err = device_create_file(osst_member, &dev_attr_ADR_rev); - if (err) - goto err_out; ---- a/drivers/scsi/sg.c -+++ b/drivers/scsi/sg.c -@@ -1441,17 +1441,18 @@ sg_add(struct device *cl_dev, struct cla - if (sg_sysfs_valid) { - struct device *sg_class_member; - -- sg_class_member = device_create(sg_sysfs_class, cl_dev->parent, -- MKDEV(SCSI_GENERIC_MAJOR, -- sdp->index), -- "%s", disk->disk_name); -+ sg_class_member = device_create_drvdata(sg_sysfs_class, -+ cl_dev->parent, -+ MKDEV(SCSI_GENERIC_MAJOR, -+ sdp->index), -+ sdp, -+ "%s", disk->disk_name); - if (IS_ERR(sg_class_member)) { - printk(KERN_ERR "sg_add: " - "device_create failed\n"); - error = PTR_ERR(sg_class_member); - goto cdev_add_err; - } -- dev_set_drvdata(sg_class_member, sdp); - error = sysfs_create_link(&scsidp->sdev_gendev.kobj, - &sg_class_member->kobj, "generic"); - if (error) ---- a/drivers/scsi/st.c -+++ b/drivers/scsi/st.c -@@ -4424,17 +4424,19 @@ static int do_create_class_files(struct - snprintf(name, 10, "%s%s%s", rew ? "n" : "", - STp->disk->disk_name, st_formats[i]); - st_class_member = -- device_create(st_sysfs_class, &STp->device->sdev_gendev, -- MKDEV(SCSI_TAPE_MAJOR, -- TAPE_MINOR(dev_num, mode, rew)), -- "%s", name); -+ device_create_drvdata(st_sysfs_class, -+ &STp->device->sdev_gendev, -+ MKDEV(SCSI_TAPE_MAJOR, -+ TAPE_MINOR(dev_num, -+ mode, rew)), -+ &STp->modes[mode], -+ "%s", name); - if (IS_ERR(st_class_member)) { - printk(KERN_WARNING "st%d: device_create failed\n", - dev_num); - error = PTR_ERR(st_class_member); - goto out; - } -- dev_set_drvdata(st_class_member, &STp->modes[mode]); - - error = device_create_file(st_class_member, - &dev_attr_defined); diff --git a/driver-core.current/sound-fix-race-in-device_create.patch b/driver-core.current/sound-fix-race-in-device_create.patch deleted file mode 100644 index 7dbb85e8fcc099..00000000000000 --- a/driver-core.current/sound-fix-race-in-device_create.patch +++ /dev/null @@ -1,47 +0,0 @@ -From foo@baz Tue Apr 9 12:12:43 2002 -Date: Fri, 16 May 2008 17:55:12 -0700 -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: SOUND: fix race in device_create - -From: Greg Kroah-Hartman <gregkh@suse.de> - -There is a race from when a device is created with device_create() and -then the drvdata is set with a call to dev_set_drvdata() in which a -sysfs file could be open, yet the drvdata will be NULL, causing all -sorts of bad things to happen. - -This patch fixes the problem by using the new function, -device_create_drvdata(). - -Cc: Kay Sievers <kay.sievers@vrfy.org> -Cc: Jaroslav Kysela <perex@perex.cz> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - sound/core/sound.c | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - ---- a/sound/core/sound.c -+++ b/sound/core/sound.c -@@ -259,8 +259,9 @@ int snd_register_device_for_dev(int type - return minor; - } - snd_minors[minor] = preg; -- preg->dev = device_create(sound_class, device, MKDEV(major, minor), -- "%s", name); -+ preg->dev = device_create_drvdata(sound_class, device, -+ MKDEV(major, minor), -+ private_data, "%s", name); - if (IS_ERR(preg->dev)) { - snd_minors[minor] = NULL; - mutex_unlock(&sound_mutex); -@@ -269,9 +270,6 @@ int snd_register_device_for_dev(int type - return minor; - } - -- if (preg->dev) -- dev_set_drvdata(preg->dev, private_data); -- - mutex_unlock(&sound_mutex); - return 0; - } diff --git a/driver-core.current/uio-fix-race-in-device_create.patch b/driver-core.current/uio-fix-race-in-device_create.patch deleted file mode 100644 index f3c5603c0e6eff..00000000000000 --- a/driver-core.current/uio-fix-race-in-device_create.patch +++ /dev/null @@ -1,44 +0,0 @@ -From foo@baz Tue Apr 9 12:12:43 2002 -Date: Fri, 16 May 2008 17:55:12 -0700 -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: UIO: fix race in device_create - -From: Greg Kroah-Hartman <gregkh@suse.de> - -There is a race from when a device is created with device_create() and -then the drvdata is set with a call to dev_set_drvdata() in which a -sysfs file could be open, yet the drvdata will be NULL, causing all -sorts of bad things to happen. - -This patch fixes the problem by using the new function, -device_create_drvdata(). - -Cc: Kay Sievers <kay.sievers@vrfy.org> -Cc: Hans J. Koch <hjk@linutronix.de> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/uio/uio.c | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - ---- a/drivers/uio/uio.c -+++ b/drivers/uio/uio.c -@@ -649,15 +649,14 @@ int __uio_register_device(struct module - if (ret) - goto err_get_minor; - -- idev->dev = device_create(uio_class->class, parent, -- MKDEV(uio_major, idev->minor), -- "uio%d", idev->minor); -+ idev->dev = device_create_drvdata(uio_class->class, parent, -+ MKDEV(uio_major, idev->minor), idev, -+ "uio%d", idev->minor); - if (IS_ERR(idev->dev)) { - printk(KERN_ERR "UIO: device register failed\n"); - ret = PTR_ERR(idev->dev); - goto err_device_create; - } -- dev_set_drvdata(idev->dev, idev); - - ret = uio_dev_add_attributes(idev); - if (ret) diff --git a/driver-core.current/usb-core-fix-race-in-device_create.patch b/driver-core.current/usb-core-fix-race-in-device_create.patch deleted file mode 100644 index e526bd217412a8..00000000000000 --- a/driver-core.current/usb-core-fix-race-in-device_create.patch +++ /dev/null @@ -1,40 +0,0 @@ -From foo@baz Tue Apr 9 12:12:43 2002 -Date: Fri, 16 May 2008 17:55:12 -0700 -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: USB: Core: fix race in device_create - -From: Greg Kroah-Hartman <gregkh@suse.de> - -There is a race from when a device is created with device_create() and -then the drvdata is set with a call to dev_set_drvdata() in which a -sysfs file could be open, yet the drvdata will be NULL, causing all -sorts of bad things to happen. - -This patch fixes the problem by using the new function, -device_create_drvdata(). - -Cc: Kay Sievers <kay.sievers@vrfy.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/core/hcd.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- a/drivers/usb/core/hcd.c -+++ b/drivers/usb/core/hcd.c -@@ -818,12 +818,12 @@ static int usb_register_bus(struct usb_b - set_bit (busnum, busmap.busmap); - bus->busnum = busnum; - -- bus->dev = device_create(usb_host_class, bus->controller, MKDEV(0, 0), -- "usb_host%d", busnum); -+ bus->dev = device_create_drvdata(usb_host_class, bus->controller, -+ MKDEV(0, 0), bus, -+ "usb_host%d", busnum); - result = PTR_ERR(bus->dev); - if (IS_ERR(bus->dev)) - goto error_create_class_dev; -- dev_set_drvdata(bus->dev, bus); - - /* Add it to the local list of buses */ - list_add (&bus->bus_list, &usb_bus_list); diff --git a/driver-core.current/usb-phidget-fix-race-in-device_create.patch b/driver-core.current/usb-phidget-fix-race-in-device_create.patch deleted file mode 100644 index a1c0180824b802..00000000000000 --- a/driver-core.current/usb-phidget-fix-race-in-device_create.patch +++ /dev/null @@ -1,88 +0,0 @@ -From foo@baz Tue Apr 9 12:12:43 2002 -Date: Fri, 16 May 2008 17:55:12 -0700 -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: USB: Phidget: fix race in device_create - -From: Greg Kroah-Hartman <gregkh@suse.de> - -There is a race from when a device is created with device_create() and -then the drvdata is set with a call to dev_set_drvdata() in which a -sysfs file could be open, yet the drvdata will be NULL, causing all -sorts of bad things to happen. - -This patch fixes the problem by using the new function, -device_create_drvdata(). It fixes all 3 phidget drivers, which all have -the same problem. - -Cc: Kay Sievers <kay.sievers@vrfy.org> -Cc: Sean Young <sean@mess.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/misc/phidgetkit.c | 6 +++--- - drivers/usb/misc/phidgetmotorcontrol.c | 7 +++---- - drivers/usb/misc/phidgetservo.c | 6 +++--- - 3 files changed, 9 insertions(+), 10 deletions(-) - ---- a/drivers/usb/misc/phidgetkit.c -+++ b/drivers/usb/misc/phidgetkit.c -@@ -595,14 +595,14 @@ static int interfacekit_probe(struct usb - } while(value); - kit->dev_no = bit; - -- kit->dev = device_create(phidget_class, &kit->udev->dev, 0, -- "interfacekit%d", kit->dev_no); -+ kit->dev = device_create_drvdata(phidget_class, &kit->udev->dev, -+ MKDEV(0, 0), kit, -+ "interfacekit%d", kit->dev_no); - if (IS_ERR(kit->dev)) { - rc = PTR_ERR(kit->dev); - kit->dev = NULL; - goto out; - } -- dev_set_drvdata(kit->dev, kit); - - if (usb_submit_urb(kit->irq, GFP_KERNEL)) { - rc = -EIO; ---- a/drivers/usb/misc/phidgetmotorcontrol.c -+++ b/drivers/usb/misc/phidgetmotorcontrol.c -@@ -365,16 +365,15 @@ static int motorcontrol_probe(struct usb - } while(value); - mc->dev_no = bit; - -- mc->dev = device_create(phidget_class, &mc->udev->dev, 0, -- "motorcontrol%d", mc->dev_no); -+ mc->dev = device_create_drvdata(phidget_class, &mc->udev->dev, -+ MKDEV(0, 0), mc, -+ "motorcontrol%d", mc->dev_no); - if (IS_ERR(mc->dev)) { - rc = PTR_ERR(mc->dev); - mc->dev = NULL; - goto out; - } - -- dev_set_drvdata(mc->dev, mc); -- - if (usb_submit_urb(mc->irq, GFP_KERNEL)) { - rc = -EIO; - goto out; ---- a/drivers/usb/misc/phidgetservo.c -+++ b/drivers/usb/misc/phidgetservo.c -@@ -275,14 +275,14 @@ servo_probe(struct usb_interface *interf - } while (value); - dev->dev_no = bit; - -- dev->dev = device_create(phidget_class, &dev->udev->dev, 0, -- "servo%d", dev->dev_no); -+ dev->dev = device_create_drvdata(phidget_class, &dev->udev->dev, -+ MKDEV(0, 0), dev, -+ "servo%d", dev->dev_no); - if (IS_ERR(dev->dev)) { - rc = PTR_ERR(dev->dev); - dev->dev = NULL; - goto out; - } -- dev_set_drvdata(dev->dev, dev); - - servo_count = dev->type & SERVO_COUNT_QUAD ? 4 : 1; - diff --git a/driver-core/sysfs-add-sys-dev-char-block-to-lookup-sysfs-path-by-major-minor.patch b/driver-core/sysfs-add-sys-dev-char-block-to-lookup-sysfs-path-by-major-minor.patch index 5203ac2f91114b..89b6e807e7a7bc 100644 --- a/driver-core/sysfs-add-sys-dev-char-block-to-lookup-sysfs-path-by-major-minor.patch +++ b/driver-core/sysfs-add-sys-dev-char-block-to-lookup-sysfs-path-by-major-minor.patch @@ -50,20 +50,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> include/linux/device.h | 3 + 7 files changed, 124 insertions(+), 2 deletions(-) ---- a/block/genhd.c -+++ b/block/genhd.c -@@ -368,7 +368,10 @@ static struct kobject *base_probe(dev_t - - static int __init genhd_device_init(void) - { -- int error = class_register(&block_class); -+ int error; -+ -+ block_class.dev_kobj = sysfs_dev_block_kobj; -+ error = class_register(&block_class); - if (unlikely(error)) - return error; - bdev_map = kobj_map_init(base_probe, &block_class_lock); --- /dev/null +++ b/Documentation/ABI/testing/sysfs-dev @@ -0,0 +1,20 @@ @@ -109,6 +95,20 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> More information can driver-model specific features can be found in Documentation/driver-model/. +--- a/block/genhd.c ++++ b/block/genhd.c +@@ -368,7 +368,10 @@ static struct kobject *base_probe(dev_t + + static int __init genhd_device_init(void) + { +- int error = class_register(&block_class); ++ int error; ++ ++ block_class.dev_kobj = sysfs_dev_block_kobj; ++ error = class_register(&block_class); + if (unlikely(error)) + return error; + bdev_map = kobj_map_init(base_probe, &block_class_lock); --- a/drivers/base/class.c +++ b/drivers/base/class.c @@ -148,6 +148,10 @@ int class_register(struct class *cls) @@ -248,7 +248,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } EXPORT_SYMBOL_GPL(device_for_each_child); -@@ -1438,4 +1516,7 @@ void device_shutdown(void) +@@ -1436,4 +1514,7 @@ void device_shutdown(void) dev->driver->shutdown(dev); } } diff --git a/gregkh/sysrq-u-laptop.patch b/gregkh/sysrq-u-laptop.patch index 03dde74f1ec43b..49c8cf9a3df2e4 100644 --- a/gregkh/sysrq-u-laptop.patch +++ b/gregkh/sysrq-u-laptop.patch @@ -12,10 +12,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/char/sysrq.c +++ b/drivers/char/sysrq.c -@@ -402,7 +402,7 @@ static struct sysrq_key_op *sysrq_key_ta - &sysrq_showstate_blocked_op, /* w */ +@@ -403,7 +403,7 @@ static struct sysrq_key_op *sysrq_key_ta /* x: May be registered on ppc/powerpc for xmon */ NULL, /* x */ + /* y: May be registered on sparc64 for global register dump */ - NULL, /* y */ + &sysrq_mountro_op, /* y stupid fujitsu laptop, can't hit the U key */ NULL /* z */ diff --git a/ldp.next/input-add-appleir-driver.patch b/ldp.next/input-add-appleir-driver.patch index 009e6fb96b2227..4a77f1b4e1ec8d 100644 --- a/ldp.next/input-add-appleir-driver.patch +++ b/ldp.next/input-add-appleir-driver.patch @@ -28,7 +28,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define USB_DEVICE_ID_APPLE_IRCONTROL4 0x8242 #define USB_VENDOR_ID_ASUS 0x0b05 -@@ -443,6 +444,7 @@ static const struct hid_blacklist { +@@ -450,6 +451,7 @@ static const struct hid_blacklist { { USB_VENDOR_ID_AFATECH, USB_DEVICE_ID_AFATECH_AF9016, HID_QUIRK_FULLSPEED_INTERVAL }, { USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM, HID_QUIRK_HIDDEV }, @@ -36,6 +36,34 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4, HID_QUIRK_HIDDEV | HID_QUIRK_IGNORE_HIDINPUT }, { USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE, HID_QUIRK_HIDDEV | HID_QUIRK_IGNORE_HIDINPUT }, { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV, HID_QUIRK_HIDINPUT }, +--- a/drivers/input/misc/Kconfig ++++ b/drivers/input/misc/Kconfig +@@ -149,6 +149,18 @@ config INPUT_KEYSPAN_REMOTE + To compile this driver as a module, choose M here: the module will + be called keyspan_remote. + ++config INPUT_APPLEIR ++ tristate "Apple Mac Mini USB IR receiver (built in)" ++ depends on USB_ARCH_HAS_HCD ++ select USB ++ help ++ Say Y here if you want to use a Apple USB remote control. This ++ device is traditionally inside an Intel Apple Mac Mini, but might ++ show up in other places. ++ ++ To compile this driver as a module, choose M here: the module will ++ be called appleir. ++ + config INPUT_POWERMATE + tristate "Griffin PowerMate and Contour Jog support" + depends on USB_ARCH_HAS_HCD +--- a/drivers/input/misc/Makefile ++++ b/drivers/input/misc/Makefile +@@ -19,3 +19,4 @@ obj-$(CONFIG_INPUT_YEALINK) += yealink. + obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.o + obj-$(CONFIG_INPUT_UINPUT) += uinput.o + obj-$(CONFIG_INPUT_APANEL) += apanel.o ++obj-$(CONFIG_INPUT_APPLEIR) += appleir.o --- /dev/null +++ b/drivers/input/misc/appleir.c @@ -0,0 +1,361 @@ @@ -400,31 +428,3 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +module_init(appleir_init); +module_exit(appleir_exit); ---- a/drivers/input/misc/Kconfig -+++ b/drivers/input/misc/Kconfig -@@ -149,6 +149,18 @@ config INPUT_KEYSPAN_REMOTE - To compile this driver as a module, choose M here: the module will - be called keyspan_remote. - -+config INPUT_APPLEIR -+ tristate "Apple Mac Mini USB IR receiver (built in)" -+ depends on USB_ARCH_HAS_HCD -+ select USB -+ help -+ Say Y here if you want to use a Apple USB remote control. This -+ device is traditionally inside an Intel Apple Mac Mini, but might -+ show up in other places. -+ -+ To compile this driver as a module, choose M here: the module will -+ be called appleir. -+ - config INPUT_POWERMATE - tristate "Griffin PowerMate and Contour Jog support" - depends on USB_ARCH_HAS_HCD ---- a/drivers/input/misc/Makefile -+++ b/drivers/input/misc/Makefile -@@ -19,3 +19,4 @@ obj-$(CONFIG_INPUT_YEALINK) += yealink. - obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.o - obj-$(CONFIG_INPUT_UINPUT) += uinput.o - obj-$(CONFIG_INPUT_APANEL) += apanel.o -+obj-$(CONFIG_INPUT_APPLEIR) += appleir.o @@ -11,19 +11,6 @@ gregkh/detect-atomic-counter-underflows.patch ################################# # Driver core patches for 2.6.26 ################################# -driver-core.current/driver-core-add-device_create_vargs-and-device_create_drvdata.patch -driver-core.current/mm-bdi-fix-race-in-bdi_class-device-creation.patch -driver-core.current/fbdev-fix-race-in-device_create.patch -driver-core.current/ide-fix-race-in-device_create.patch -driver-core.current/ib-fix-race-in-device_create.patch -driver-core.current/leds-fix-race-in-device_create.patch -driver-core.current/power-supply-fix-race-in-device_create.patch -driver-core.current/uio-fix-race-in-device_create.patch -driver-core.current/sound-fix-race-in-device_create.patch -driver-core.current/s390-fix-race-in-device_create.patch -driver-core.current/usb-phidget-fix-race-in-device_create.patch -driver-core.current/usb-core-fix-race-in-device_create.patch -driver-core.current/scsi-fix-race-in-device_create.patch # broken still :( driver-core.current/kobject-fix-kobject_rename-and-config_sysfs.patch @@ -31,14 +18,6 @@ driver-core.current/kobject-fix-kobject_rename-and-config_sysfs.patch ################################# # USB patches for 2.6.26 ################################# -usb.current/usb-serial-use-ftdi_sio-driver-for-ratoc-rex-usb60f.patch -usb.current/usb-add-telit-hdspa-modem-to-option-driver.patch -usb.current/usb-option-fix-name-of-onda-msa501hs-hsdpa-modem.patch -usb.current/usb-pxa27x_udc-fix-oops.patch -usb.current/usb-build-fix.patch -usb.current/usb-serial-ch341-new-vid-pid-for-ch341-usb-serial.patch -usb.current/usb-ehci-orion-the-orion-ehci-root-hub-does-have-a-transaction-translator.patch -usb.current/usb-cdc-wdm-driver.patch ##################################################################### diff --git a/usb.current/usb-add-telit-hdspa-modem-to-option-driver.patch b/usb.current/usb-add-telit-hdspa-modem-to-option-driver.patch deleted file mode 100644 index 7a0647025bc60e..00000000000000 --- a/usb.current/usb-add-telit-hdspa-modem-to-option-driver.patch +++ /dev/null @@ -1,41 +0,0 @@ -From foo@baz Tue Apr 9 12:12:43 2002 -Date: Thu, 15 May 2008 10:07:44 -0700 -To: Greg KH <greg@kroah.com> -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: USB: add TELIT HDSPA UC864-E modem to option driver - -This adds the Telit UC864-E HDSPA modem support to the option driver. -This lets their customers comply with the GPL instead of having to use a -binary driver from the manufacturer. - -Cc: Simon Kissel <kissel@viprinet.com> -Cc: Nico Erfurth <ne@nicoerfurth.de> -Cc: Andrea Ghezzo <TS-EMEA@telit.com> -Cc: Dietmar Staps <Dietmar.Staps@telit.com> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/option.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/drivers/usb/serial/option.c -+++ b/drivers/usb/serial/option.c -@@ -196,6 +196,9 @@ static int option_send_setup(struct usb - - #define MAXON_VENDOR_ID 0x16d8 - -+#define TELIT_VENDOR_ID 0x1bc7 -+#define TELIT_PRODUCT_UC864E 0x1003 -+ - static struct usb_device_id option_ids[] = { - { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, - { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) }, -@@ -304,6 +307,7 @@ static struct usb_device_id option_ids[] - { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */ - { USB_DEVICE(MAXON_VENDOR_ID, 0x6280) }, /* BP3-USB & BP3-EXT HSDPA */ - { USB_DEVICE(0x19d2, 0x0001) }, /* Telstra NextG CDMA */ -+ { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864E) }, - { } /* Terminating entry */ - }; - MODULE_DEVICE_TABLE(usb, option_ids); diff --git a/usb.current/usb-build-fix.patch b/usb.current/usb-build-fix.patch deleted file mode 100644 index 38ff12d0cb44bd..00000000000000 --- a/usb.current/usb-build-fix.patch +++ /dev/null @@ -1,35 +0,0 @@ -From mingo@elte.hu Fri May 16 12:22:28 2008 -From: Ingo Molnar <mingo@elte.hu> -Date: Fri, 16 May 2008 09:30:14 +0200 -Subject: USB: build fix -To: Greg Kroah-Hartman <gregkh@suse.de> -Message-ID: <20080516073014.GA18443@elte.hu> -Content-Disposition: inline - -From: Ingo Molnar <mingo@elte.hu> - -this config: - -http://redhat.com/~mingo/misc/config-Wed_Apr_30_15_12_48_CEST_2008.bad - -fails to build due to an #error. Turn that into a #warning instead -to not break randconfig builds unnecessarily. - -Signed-off-by: Ingo Molnar <mingo@elte.hu> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/net/usb/cdc_subset.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/net/usb/cdc_subset.c -+++ b/drivers/net/usb/cdc_subset.c -@@ -218,7 +218,7 @@ static const struct driver_info blob_inf - /*-------------------------------------------------------------------------*/ - - #ifndef HAVE_HARDWARE --#error You need to configure some hardware for this driver -+#warning You need to configure some hardware for this driver - #endif - - /* diff --git a/usb.current/usb-cdc-wdm-driver.patch b/usb.current/usb-cdc-wdm-driver.patch deleted file mode 100644 index c9cba53d3bd725..00000000000000 --- a/usb.current/usb-cdc-wdm-driver.patch +++ /dev/null @@ -1,805 +0,0 @@ -From oliver@neukum.org Thu May 15 15:48:08 2008 -From: Oliver Neukum <oliver@neukum.org> -Date: Tue, 13 May 2008 17:01:25 +0200 -Subject: USB: CDC WDM driver -To: David Brownell <david-b@pacbell.net> -Cc: "Carl Nordbeck" <carl.nordbeck@ericsson.com>, USB list <linux-usb@vger.kernel.org>, "Greg Kroah-Hartman" <gregkh@suse.de> -Message-ID: <200805131701.26513.oliver@neukum.org> -Content-Disposition: inline - - -Signed-off-by: Oliver Neukum <oneukum@suse.de> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/class/Kconfig | 11 - drivers/usb/class/Makefile | 1 - drivers/usb/class/cdc-wdm.c | 740 ++++++++++++++++++++++++++++++++++++++++++++ - include/linux/usb/cdc.h | 9 - 4 files changed, 761 insertions(+) - ---- /dev/null -+++ b/drivers/usb/class/cdc-wdm.c -@@ -0,0 +1,740 @@ -+/* -+ * cdc-wdm.c -+ * -+ * This driver supports USB CDC WCM Device Management. -+ * -+ * Copyright (c) 2007-2008 Oliver Neukum -+ * -+ * Some code taken from cdc-acm.c -+ * -+ * Released under the GPLv2. -+ * -+ * Many thanks to Carl Nordbeck -+ */ -+#include <linux/kernel.h> -+#include <linux/errno.h> -+#include <linux/slab.h> -+#include <linux/module.h> -+#include <linux/smp_lock.h> -+#include <linux/mutex.h> -+#include <linux/uaccess.h> -+#include <linux/bitops.h> -+#include <linux/poll.h> -+#include <linux/usb.h> -+#include <linux/usb/cdc.h> -+#include <asm/byteorder.h> -+#include <asm/unaligned.h> -+ -+/* -+ * Version Information -+ */ -+#define DRIVER_VERSION "v0.02" -+#define DRIVER_AUTHOR "Oliver Neukum" -+ -+static struct usb_device_id wdm_ids[] = { -+ { -+ .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS | -+ USB_DEVICE_ID_MATCH_INT_SUBCLASS, -+ .bInterfaceClass = USB_CLASS_COMM, -+ .bInterfaceSubClass = USB_CDC_SUBCLASS_DMM -+ }, -+ { } -+}; -+ -+#define WDM_MINOR_BASE 176 -+ -+ -+#define WDM_IN_USE 1 -+#define WDM_DISCONNECTING 2 -+#define WDM_RESULT 3 -+#define WDM_READ 4 -+#define WDM_INT_STALL 5 -+#define WDM_POLL_RUNNING 6 -+ -+ -+#define WDM_MAX 16 -+ -+ -+static DEFINE_MUTEX(wdm_mutex); -+ -+/* --- method tables --- */ -+ -+struct wdm_device { -+ u8 *inbuf; /* buffer for response */ -+ u8 *outbuf; /* buffer for command */ -+ u8 *sbuf; /* buffer for status */ -+ u8 *ubuf; /* buffer for copy to user space */ -+ -+ struct urb *command; -+ struct urb *response; -+ struct urb *validity; -+ struct usb_interface *intf; -+ struct usb_ctrlrequest *orq; -+ struct usb_ctrlrequest *irq; -+ spinlock_t iuspin; -+ -+ unsigned long flags; -+ u16 bufsize; -+ u16 wMaxCommand; -+ u16 wMaxPacketSize; -+ u16 bMaxPacketSize0; -+ __le16 inum; -+ int reslength; -+ int length; -+ int read; -+ int count; -+ dma_addr_t shandle; -+ dma_addr_t ihandle; -+ struct mutex wlock; -+ struct mutex rlock; -+ wait_queue_head_t wait; -+ struct work_struct rxwork; -+ int werr; -+ int rerr; -+}; -+ -+static struct usb_driver wdm_driver; -+ -+/* --- callbacks --- */ -+static void wdm_out_callback(struct urb *urb) -+{ -+ struct wdm_device *desc; -+ desc = urb->context; -+ spin_lock(&desc->iuspin); -+ desc->werr = urb->status; -+ spin_unlock(&desc->iuspin); -+ clear_bit(WDM_IN_USE, &desc->flags); -+ kfree(desc->outbuf); -+ wake_up(&desc->wait); -+} -+ -+static void wdm_in_callback(struct urb *urb) -+{ -+ struct wdm_device *desc = urb->context; -+ int status = urb->status; -+ -+ spin_lock(&desc->iuspin); -+ -+ if (status) { -+ switch (status) { -+ case -ENOENT: -+ dev_dbg(&desc->intf->dev, -+ "nonzero urb status received: -ENOENT"); -+ break; -+ case -ECONNRESET: -+ dev_dbg(&desc->intf->dev, -+ "nonzero urb status received: -ECONNRESET"); -+ break; -+ case -ESHUTDOWN: -+ dev_dbg(&desc->intf->dev, -+ "nonzero urb status received: -ESHUTDOWN"); -+ break; -+ case -EPIPE: -+ err("nonzero urb status received: -EPIPE"); -+ break; -+ default: -+ err("Unexpected error %d", status); -+ break; -+ } -+ } -+ -+ desc->rerr = status; -+ desc->reslength = urb->actual_length; -+ memmove(desc->ubuf + desc->length, desc->inbuf, desc->reslength); -+ desc->length += desc->reslength; -+ wake_up(&desc->wait); -+ -+ set_bit(WDM_READ, &desc->flags); -+ spin_unlock(&desc->iuspin); -+} -+ -+static void wdm_int_callback(struct urb *urb) -+{ -+ int rv = 0; -+ int status = urb->status; -+ struct wdm_device *desc; -+ struct usb_ctrlrequest *req; -+ struct usb_cdc_notification *dr; -+ -+ desc = urb->context; -+ req = desc->irq; -+ dr = (struct usb_cdc_notification *)desc->sbuf; -+ -+ if (status) { -+ switch (status) { -+ case -ESHUTDOWN: -+ case -ENOENT: -+ case -ECONNRESET: -+ return; /* unplug */ -+ case -EPIPE: -+ set_bit(WDM_INT_STALL, &desc->flags); -+ err("Stall on int endpoint"); -+ goto sw; /* halt is cleared in work */ -+ default: -+ err("nonzero urb status received: %d", status); -+ break; -+ } -+ } -+ -+ if (urb->actual_length < sizeof(struct usb_cdc_notification)) { -+ err("wdm_int_callback - %d bytes", urb->actual_length); -+ goto exit; -+ } -+ -+ switch (dr->bNotificationType) { -+ case USB_CDC_NOTIFY_RESPONSE_AVAILABLE: -+ dev_dbg(&desc->intf->dev, -+ "NOTIFY_RESPONSE_AVAILABLE received: index %d len %d", -+ dr->wIndex, dr->wLength); -+ break; -+ -+ case USB_CDC_NOTIFY_NETWORK_CONNECTION: -+ -+ dev_dbg(&desc->intf->dev, -+ "NOTIFY_NETWORK_CONNECTION %s network", -+ dr->wValue ? "connected to" : "disconnected from"); -+ goto exit; -+ default: -+ clear_bit(WDM_POLL_RUNNING, &desc->flags); -+ err("unknown notification %d received: index %d len %d", -+ dr->bNotificationType, dr->wIndex, dr->wLength); -+ goto exit; -+ } -+ -+ req->bRequestType = (USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE); -+ req->bRequest = USB_CDC_GET_ENCAPSULATED_RESPONSE; -+ req->wValue = 0; -+ req->wIndex = desc->inum; -+ req->wLength = cpu_to_le16(desc->bMaxPacketSize0); -+ -+ usb_fill_control_urb( -+ desc->response, -+ interface_to_usbdev(desc->intf), -+ /* using common endpoint 0 */ -+ usb_rcvctrlpipe(interface_to_usbdev(desc->intf), 0), -+ (unsigned char *)req, -+ desc->inbuf, -+ desc->bMaxPacketSize0, -+ wdm_in_callback, -+ desc -+ ); -+ desc->response->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; -+ spin_lock(&desc->iuspin); -+ clear_bit(WDM_READ, &desc->flags); -+ if (!test_bit(WDM_DISCONNECTING, &desc->flags)) { -+ rv = usb_submit_urb(desc->response, GFP_ATOMIC); -+ dev_dbg(&desc->intf->dev, "%s: usb_submit_urb %d", -+ __func__, rv); -+ } -+ spin_unlock(&desc->iuspin); -+ if (rv < 0) { -+ if (rv == -EPERM) -+ return; -+ if (rv == -ENOMEM) { -+sw: -+ rv = schedule_work(&desc->rxwork); -+ if (rv) -+ err("Cannot schedule work"); -+ } -+ } -+exit: -+ rv = usb_submit_urb(urb, GFP_ATOMIC); -+ if (rv) -+ err("%s - usb_submit_urb failed with result %d", -+ __func__, rv); -+ -+} -+ -+static void kill_urbs(struct wdm_device *desc) -+{ -+ usb_kill_urb(desc->command); -+ usb_kill_urb(desc->validity); -+ usb_kill_urb(desc->response); -+} -+ -+static void free_urbs(struct wdm_device *desc) -+{ -+ usb_free_urb(desc->validity); -+ usb_free_urb(desc->response); -+ usb_free_urb(desc->command); -+} -+ -+static void cleanup(struct wdm_device *desc) -+{ -+ usb_buffer_free(interface_to_usbdev(desc->intf), -+ desc->wMaxPacketSize, -+ desc->sbuf, -+ desc->validity->transfer_dma); -+ usb_buffer_free(interface_to_usbdev(desc->intf), -+ desc->wMaxPacketSize, -+ desc->inbuf, -+ desc->response->transfer_dma); -+ kfree(desc->orq); -+ kfree(desc->irq); -+ kfree(desc->ubuf); -+ free_urbs(desc); -+ kfree(desc); -+} -+ -+static ssize_t wdm_write -+(struct file *file, const char __user *buffer, size_t count, loff_t *ppos) -+{ -+ u8 *buf; -+ int rv = -EMSGSIZE, r, we; -+ struct wdm_device *desc = file->private_data; -+ struct usb_ctrlrequest *req; -+ -+ if (count > desc->wMaxCommand) -+ count = desc->wMaxCommand; -+ -+ spin_lock_irq(&desc->iuspin); -+ we = desc->werr; -+ desc->werr = 0; -+ spin_unlock_irq(&desc->iuspin); -+ if (we < 0) -+ return -EIO; -+ -+ r = mutex_lock_interruptible(&desc->wlock); /* concurrent writes */ -+ rv = -ERESTARTSYS; -+ if (r) -+ goto outnl; -+ -+ r = wait_event_interruptible(desc->wait, !test_bit(WDM_IN_USE, -+ &desc->flags)); -+ if (r < 0) -+ goto out; -+ -+ if (test_bit(WDM_DISCONNECTING, &desc->flags)) { -+ rv = -ENODEV; -+ goto out; -+ } -+ -+ desc->outbuf = buf = kmalloc(count, GFP_KERNEL); -+ if (!buf) { -+ rv = -ENOMEM; -+ goto out; -+ } -+ -+ r = copy_from_user(buf, buffer, count); -+ if (r > 0) { -+ kfree(buf); -+ rv = -EFAULT; -+ goto out; -+ } -+ -+ req = desc->orq; -+ usb_fill_control_urb( -+ desc->command, -+ interface_to_usbdev(desc->intf), -+ /* using common endpoint 0 */ -+ usb_sndctrlpipe(interface_to_usbdev(desc->intf), 0), -+ (unsigned char *)req, -+ buf, -+ count, -+ wdm_out_callback, -+ desc -+ ); -+ -+ req->bRequestType = (USB_DIR_OUT | USB_TYPE_CLASS | -+ USB_RECIP_INTERFACE); -+ req->bRequest = USB_CDC_SEND_ENCAPSULATED_COMMAND; -+ req->wValue = 0; -+ req->wIndex = desc->inum; -+ req->wLength = cpu_to_le16(count); -+ set_bit(WDM_IN_USE, &desc->flags); -+ -+ rv = usb_submit_urb(desc->command, GFP_KERNEL); -+ if (rv < 0) { -+ kfree(buf); -+ clear_bit(WDM_IN_USE, &desc->flags); -+ } else { -+ dev_dbg(&desc->intf->dev, "Tx URB has been submitted index=%d", -+ req->wIndex); -+ } -+out: -+ mutex_unlock(&desc->wlock); -+outnl: -+ return rv < 0 ? rv : count; -+} -+ -+static ssize_t wdm_read -+(struct file *file, char __user *buffer, size_t count, loff_t *ppos) -+{ -+ int rv, cntr; -+ int i = 0; -+ struct wdm_device *desc = file->private_data; -+ -+ -+ rv = mutex_lock_interruptible(&desc->rlock); /*concurrent reads */ -+ if (rv < 0) -+ return -ERESTARTSYS; -+ -+ if (desc->length == 0) { -+ desc->read = 0; -+retry: -+ i++; -+ rv = wait_event_interruptible(desc->wait, -+ test_bit(WDM_READ, &desc->flags)); -+ -+ if (rv < 0) { -+ rv = -ERESTARTSYS; -+ goto err; -+ } -+ -+ spin_lock_irq(&desc->iuspin); -+ -+ if (desc->rerr) { /* read completed, error happened */ -+ int t = desc->rerr; -+ desc->rerr = 0; -+ spin_unlock_irq(&desc->iuspin); -+ err("reading had resulted in %d", t); -+ rv = -EIO; -+ goto err; -+ } -+ /* -+ * recheck whether we've lost the race -+ * against the completion handler -+ */ -+ if (!test_bit(WDM_READ, &desc->flags)) { /* lost race */ -+ spin_unlock_irq(&desc->iuspin); -+ goto retry; -+ } -+ if (!desc->reslength) { /* zero length read */ -+ spin_unlock_irq(&desc->iuspin); -+ goto retry; -+ } -+ clear_bit(WDM_READ, &desc->flags); -+ spin_unlock_irq(&desc->iuspin); -+ } -+ -+ cntr = count > desc->length ? desc->length : count; -+ rv = copy_to_user(buffer, desc->ubuf, cntr); -+ if (rv > 0) { -+ rv = -EFAULT; -+ goto err; -+ } -+ -+ for (i = 0; i < desc->length - cntr; i++) -+ desc->ubuf[i] = desc->ubuf[i + cntr]; -+ -+ desc->length -= cntr; -+ rv = cntr; -+ -+err: -+ mutex_unlock(&desc->rlock); -+ if (rv < 0) -+ err("wdm_read: exit error"); -+ return rv; -+} -+ -+static int wdm_flush(struct file *file, fl_owner_t id) -+{ -+ struct wdm_device *desc = file->private_data; -+ -+ wait_event(desc->wait, !test_bit(WDM_IN_USE, &desc->flags)); -+ if (desc->werr < 0) -+ err("Error in flush path: %d", desc->werr); -+ -+ return desc->werr; -+} -+ -+static unsigned int wdm_poll(struct file *file, struct poll_table_struct *wait) -+{ -+ struct wdm_device *desc = file->private_data; -+ unsigned long flags; -+ unsigned int mask = 0; -+ -+ spin_lock_irqsave(&desc->iuspin, flags); -+ if (test_bit(WDM_DISCONNECTING, &desc->flags)) { -+ mask = POLLERR; -+ spin_unlock_irqrestore(&desc->iuspin, flags); -+ goto desc_out; -+ } -+ if (test_bit(WDM_READ, &desc->flags)) -+ mask = POLLIN | POLLRDNORM; -+ if (desc->rerr || desc->werr) -+ mask |= POLLERR; -+ if (!test_bit(WDM_IN_USE, &desc->flags)) -+ mask |= POLLOUT | POLLWRNORM; -+ spin_unlock_irqrestore(&desc->iuspin, flags); -+ -+ poll_wait(file, &desc->wait, wait); -+ -+desc_out: -+ return mask; -+} -+ -+static int wdm_open(struct inode *inode, struct file *file) -+{ -+ int minor = iminor(inode); -+ int rv = -ENODEV; -+ struct usb_interface *intf; -+ struct wdm_device *desc; -+ -+ mutex_lock(&wdm_mutex); -+ intf = usb_find_interface(&wdm_driver, minor); -+ if (!intf) -+ goto out; -+ -+ desc = usb_get_intfdata(intf); -+ if (test_bit(WDM_DISCONNECTING, &desc->flags)) -+ goto out; -+ -+ desc->count++; -+ file->private_data = desc; -+ -+ rv = usb_submit_urb(desc->validity, GFP_KERNEL); -+ -+ if (rv < 0) { -+ desc->count--; -+ err("Error submitting int urb - %d", rv); -+ goto out; -+ } -+ rv = 0; -+ -+out: -+ mutex_unlock(&wdm_mutex); -+ return rv; -+} -+ -+static int wdm_release(struct inode *inode, struct file *file) -+{ -+ struct wdm_device *desc = file->private_data; -+ -+ mutex_lock(&wdm_mutex); -+ desc->count--; -+ if (!desc->count) { -+ dev_dbg(&desc->intf->dev, "wdm_release: cleanup"); -+ kill_urbs(desc); -+ } -+ mutex_unlock(&wdm_mutex); -+ return 0; -+} -+ -+static const struct file_operations wdm_fops = { -+ .owner = THIS_MODULE, -+ .read = wdm_read, -+ .write = wdm_write, -+ .open = wdm_open, -+ .flush = wdm_flush, -+ .release = wdm_release, -+ .poll = wdm_poll -+}; -+ -+static struct usb_class_driver wdm_class = { -+ .name = "cdc-wdm%d", -+ .fops = &wdm_fops, -+ .minor_base = WDM_MINOR_BASE, -+}; -+ -+/* --- error handling --- */ -+static void wdm_rxwork(struct work_struct *work) -+{ -+ struct wdm_device *desc = container_of(work, struct wdm_device, rxwork); -+ unsigned long flags; -+ int rv; -+ -+ spin_lock_irqsave(&desc->iuspin, flags); -+ if (test_bit(WDM_DISCONNECTING, &desc->flags)) { -+ spin_unlock_irqrestore(&desc->iuspin, flags); -+ } else { -+ spin_unlock_irqrestore(&desc->iuspin, flags); -+ rv = usb_submit_urb(desc->response, GFP_KERNEL); -+ if (rv < 0 && rv != -EPERM) { -+ spin_lock_irqsave(&desc->iuspin, flags); -+ if (!test_bit(WDM_DISCONNECTING, &desc->flags)) -+ schedule_work(&desc->rxwork); -+ spin_unlock_irqrestore(&desc->iuspin, flags); -+ } -+ } -+} -+ -+/* --- hotplug --- */ -+ -+static int wdm_probe(struct usb_interface *intf, const struct usb_device_id *id) -+{ -+ int rv = -EINVAL; -+ struct usb_device *udev = interface_to_usbdev(intf); -+ struct wdm_device *desc; -+ struct usb_host_interface *iface; -+ struct usb_endpoint_descriptor *ep; -+ struct usb_cdc_dmm_desc *dmhd; -+ u8 *buffer = intf->altsetting->extra; -+ int buflen = intf->altsetting->extralen; -+ u16 maxcom = 0; -+ -+ if (!buffer) -+ goto out; -+ -+ while (buflen > 0) { -+ if (buffer [1] != USB_DT_CS_INTERFACE) { -+ err("skipping garbage"); -+ goto next_desc; -+ } -+ -+ switch (buffer [2]) { -+ case USB_CDC_HEADER_TYPE: -+ break; -+ case USB_CDC_DMM_TYPE: -+ dmhd = (struct usb_cdc_dmm_desc *)buffer; -+ maxcom = le16_to_cpu(dmhd->wMaxCommand); -+ dev_dbg(&intf->dev, -+ "Finding maximum buffer length: %d", maxcom); -+ break; -+ default: -+ err("Ignoring extra header, type %d, length %d", -+ buffer[2], buffer[0]); -+ break; -+ } -+next_desc: -+ buflen -= buffer[0]; -+ buffer += buffer[0]; -+ } -+ -+ rv = -ENOMEM; -+ desc = kzalloc(sizeof(struct wdm_device), GFP_KERNEL); -+ if (!desc) -+ goto out; -+ mutex_init(&desc->wlock); -+ mutex_init(&desc->rlock); -+ spin_lock_init(&desc->iuspin); -+ init_waitqueue_head(&desc->wait); -+ desc->wMaxCommand = maxcom; -+ desc->inum = cpu_to_le16((u16)intf->cur_altsetting->desc.bInterfaceNumber); -+ desc->intf = intf; -+ INIT_WORK(&desc->rxwork, wdm_rxwork); -+ -+ iface = &intf->altsetting[0]; -+ ep = &iface->endpoint[0].desc; -+ if (!usb_endpoint_is_int_in(ep)) { -+ rv = -EINVAL; -+ goto err; -+ } -+ -+ desc->wMaxPacketSize = ep->wMaxPacketSize; -+ desc->bMaxPacketSize0 = cpu_to_le16(udev->descriptor.bMaxPacketSize0); -+ -+ desc->orq = kmalloc(sizeof(struct usb_ctrlrequest), GFP_KERNEL); -+ if (!desc->orq) -+ goto err; -+ desc->irq = kmalloc(sizeof(struct usb_ctrlrequest), GFP_KERNEL); -+ if (!desc->irq) -+ goto err; -+ -+ desc->validity = usb_alloc_urb(0, GFP_KERNEL); -+ if (!desc->validity) -+ goto err; -+ -+ desc->response = usb_alloc_urb(0, GFP_KERNEL); -+ if (!desc->response) -+ goto err; -+ -+ desc->command = usb_alloc_urb(0, GFP_KERNEL); -+ if (!desc->command) -+ goto err; -+ -+ desc->ubuf = kmalloc(desc->wMaxCommand, GFP_KERNEL); -+ if (!desc->ubuf) -+ goto err; -+ -+ desc->sbuf = usb_buffer_alloc(interface_to_usbdev(intf), -+ desc->wMaxPacketSize, -+ GFP_KERNEL, -+ &desc->validity->transfer_dma); -+ if (!desc->sbuf) -+ goto err; -+ -+ desc->inbuf = usb_buffer_alloc(interface_to_usbdev(intf), -+ desc->bMaxPacketSize0, -+ GFP_KERNEL, -+ &desc->response->transfer_dma); -+ if (!desc->inbuf) -+ goto err2; -+ -+ usb_fill_int_urb( -+ desc->validity, -+ interface_to_usbdev(intf), -+ usb_rcvintpipe(interface_to_usbdev(intf), ep->bEndpointAddress), -+ desc->sbuf, -+ desc->wMaxPacketSize, -+ wdm_int_callback, -+ desc, -+ ep->bInterval -+ ); -+ desc->validity->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; -+ -+ usb_set_intfdata(intf, desc); -+ rv = usb_register_dev(intf, &wdm_class); -+ dev_info(&intf->dev, "cdc-wdm%d: USB WDM device\n", -+ intf->minor - WDM_MINOR_BASE); -+ if (rv < 0) -+ goto err; -+out: -+ return rv; -+err2: -+ usb_buffer_free(interface_to_usbdev(desc->intf), -+ desc->wMaxPacketSize, -+ desc->sbuf, -+ desc->validity->transfer_dma); -+err: -+ free_urbs(desc); -+ kfree(desc->ubuf); -+ kfree(desc->orq); -+ kfree(desc->irq); -+ kfree(desc); -+ return rv; -+} -+ -+static void wdm_disconnect(struct usb_interface *intf) -+{ -+ struct wdm_device *desc; -+ unsigned long flags; -+ -+ usb_deregister_dev(intf, &wdm_class); -+ mutex_lock(&wdm_mutex); -+ desc = usb_get_intfdata(intf); -+ -+ /* the spinlock makes sure no new urbs are generated in the callbacks */ -+ spin_lock_irqsave(&desc->iuspin, flags); -+ set_bit(WDM_DISCONNECTING, &desc->flags); -+ set_bit(WDM_READ, &desc->flags); -+ clear_bit(WDM_IN_USE, &desc->flags); -+ spin_unlock_irqrestore(&desc->iuspin, flags); -+ cancel_work_sync(&desc->rxwork); -+ kill_urbs(desc); -+ wake_up_all(&desc->wait); -+ if (!desc->count) -+ cleanup(desc); -+ mutex_unlock(&wdm_mutex); -+} -+ -+static struct usb_driver wdm_driver = { -+ .name = "cdc_wdm", -+ .probe = wdm_probe, -+ .disconnect = wdm_disconnect, -+ .id_table = wdm_ids, -+}; -+ -+/* --- low level module stuff --- */ -+ -+static int __init wdm_init(void) -+{ -+ int rv; -+ -+ rv = usb_register(&wdm_driver); -+ -+ return rv; -+} -+ -+static void __exit wdm_exit(void) -+{ -+ usb_deregister(&wdm_driver); -+} -+ -+module_init(wdm_init); -+module_exit(wdm_exit); -+ -+MODULE_AUTHOR(DRIVER_AUTHOR); -+MODULE_DESCRIPTION("USB Abstract Control Model driver for " -+ "USB WCM Device Management"); -+MODULE_LICENSE("GPL"); ---- a/drivers/usb/class/Kconfig -+++ b/drivers/usb/class/Kconfig -@@ -29,3 +29,14 @@ config USB_PRINTER - To compile this driver as a module, choose M here: the - module will be called usblp. - -+config USB_WDM -+ tristate "USB Wireless Device Management support" -+ depends on USB -+ ---help--- -+ This driver supports the WMC Device Management functionality -+ of cell phones compliant to the CDC WMC specification. You can use -+ AT commands over this device. -+ -+ To compile this driver as a module, choose M here: the -+ module will be called cdc-wdm. -+ ---- a/drivers/usb/class/Makefile -+++ b/drivers/usb/class/Makefile -@@ -5,3 +5,4 @@ - - obj-$(CONFIG_USB_ACM) += cdc-acm.o - obj-$(CONFIG_USB_PRINTER) += usblp.o -+obj-$(CONFIG_USB_WDM) += cdc-wdm.o ---- a/include/linux/usb/cdc.h -+++ b/include/linux/usb/cdc.h -@@ -130,6 +130,15 @@ struct usb_cdc_ether_desc { - __u8 bNumberPowerFilters; - } __attribute__ ((packed)); - -+/* "Telephone Control Model Functional Descriptor" from CDC WMC spec 6.3..3 */ -+struct usb_cdc_dmm_desc { -+ __u8 bFunctionLength; -+ __u8 bDescriptorType; -+ __u8 bDescriptorSubtype; -+ __u16 bcdVersion; -+ __le16 wMaxCommand; -+} __attribute__ ((packed)); -+ - /* "MDLM Functional Descriptor" from CDC WMC spec 6.7.2.3 */ - struct usb_cdc_mdlm_desc { - __u8 bLength; diff --git a/usb.current/usb-ehci-orion-the-orion-ehci-root-hub-does-have-a-transaction-translator.patch b/usb.current/usb-ehci-orion-the-orion-ehci-root-hub-does-have-a-transaction-translator.patch deleted file mode 100644 index 8a98c7a7237c78..00000000000000 --- a/usb.current/usb-ehci-orion-the-orion-ehci-root-hub-does-have-a-transaction-translator.patch +++ /dev/null @@ -1,39 +0,0 @@ -From buytenh@wantstofly.org Tue May 20 10:41:21 2008 -From: Lennert Buytenhek <buytenh@wantstofly.org> -Date: Tue, 20 May 2008 19:08:53 +0200 -Subject: USB: ehci-orion: the Orion EHCI root hub does have a Transaction Translator -To: Greg Kroah-Hartman <gregkh@suse.de>, David Brownell <david-b@pacbell.net> -Cc: "Rafael J. Wysocki" <rjw@sisk.pl>, Alan Stern <stern@rowland.harvard.edu>, Andrew Morton <akpm@linux-foundation.org>, Nicolas Pitre <nico@cam.org> -Message-ID: <20080520170853.GA26577@xi.wantstofly.org> -Content-Disposition: inline - - -Commit 7329e211b987a493cbcfca0e98c60eb108ab42df ("USB: root hubs don't -lie about their number of TTs") requires the various platform EHCI -glue modules to set ->has_tt if the root hub has a Transaction -Translator. - -The Orion EHCI root hub does have a Transaction Translator, so set -->has_tt in ehci_orion_setup(). This fixes oopsing on plugging in a -low speed device. - -Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> -Acked-by: Nicolas Pitre <nico@marvell.com> -Acked-by: David Brownell <dbrownell@users.sourceforge.net> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/host/ehci-orion.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/usb/host/ehci-orion.c -+++ b/drivers/usb/host/ehci-orion.c -@@ -115,6 +115,8 @@ static int ehci_orion_setup(struct usb_h - if (retval) - return retval; - -+ hcd->has_tt = 1; -+ - ehci_reset(ehci); - ehci_port_power(ehci, 0); - diff --git a/usb.current/usb-option-fix-name-of-onda-msa501hs-hsdpa-modem.patch b/usb.current/usb-option-fix-name-of-onda-msa501hs-hsdpa-modem.patch deleted file mode 100644 index 39a0652f152740..00000000000000 --- a/usb.current/usb-option-fix-name-of-onda-msa501hs-hsdpa-modem.patch +++ /dev/null @@ -1,44 +0,0 @@ -From acme@redhat.com Fri May 16 12:07:22 2008 -From: Arnaldo Carvalho de Melo <acme@redhat.com> -Date: Fri, 16 May 2008 15:41:40 -0300 -Subject: USB: OPTION: fix name of Onda MSA501HS HSDPA modem -To: Matthias Urlichs <smurf@smurf.noris.de> -Cc: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Augusto Campos <brain@matrix.com.br> -Message-ID: <20080516184140.GA8111@ghostprotocols.net> -Content-Disposition: inline - -This fixes the name of the onda MSA501HS device, I guess it is called -different things in different countries. - -Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/option.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/usb/serial/option.c -+++ b/drivers/usb/serial/option.c -@@ -183,6 +183,7 @@ static int option_send_setup(struct usb - #define AXESSTEL_PRODUCT_MV110H 0x1000 - - #define ONDA_VENDOR_ID 0x19d2 -+#define ONDA_PRODUCT_MSA501HS 0x0001 - #define ONDA_PRODUCT_ET502HS 0x0002 - - #define BANDRICH_VENDOR_ID 0x1A8D -@@ -300,13 +301,13 @@ static struct usb_device_id option_ids[] - { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_E100A) }, - { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_500A) }, - { USB_DEVICE(AXESSTEL_VENDOR_ID, AXESSTEL_PRODUCT_MV110H) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_MSA501HS) }, - { USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_ET502HS) }, - { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_1) }, - { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_2) }, - { USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC680) }, - { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */ - { USB_DEVICE(MAXON_VENDOR_ID, 0x6280) }, /* BP3-USB & BP3-EXT HSDPA */ -- { USB_DEVICE(0x19d2, 0x0001) }, /* Telstra NextG CDMA */ - { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864E) }, - { } /* Terminating entry */ - }; diff --git a/usb.current/usb-pxa27x_udc-fix-oops.patch b/usb.current/usb-pxa27x_udc-fix-oops.patch deleted file mode 100644 index 2f38163f4cc531..00000000000000 --- a/usb.current/usb-pxa27x_udc-fix-oops.patch +++ /dev/null @@ -1,33 +0,0 @@ -From karl.beldan@gmail.com Fri May 16 12:21:28 2008 -From: "karl beldan" <karl.beldan@gmail.com> -Date: Fri, 16 May 2008 11:30:22 +0200 -Subject: USB: pxa27x_udc - Fix Oops -To: linux-usb@vger.kernel.org -Cc: rjarzmik@free.fr -Message-ID: <ea2442770805160230x458b3ac9s8d717449d513fb52@mail.gmail.com> -Content-Disposition: inline - - -udc_disable oopses dereferencing udc_command. - -Signed-off-by: Karl Beldan <karl.beldan@gmail.com> -Acked-by: Robert Jarzmik <rjarzmik@free.fr> -Acked-by: David Brownell <dbrownell@users.sourceforge.net> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/gadget/pxa27x_udc.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/usb/gadget/pxa27x_udc.c -+++ b/drivers/usb/gadget/pxa27x_udc.c -@@ -1526,7 +1526,8 @@ static void udc_disable(struct pxa_udc * - - ep0_idle(udc); - udc->gadget.speed = USB_SPEED_UNKNOWN; -- udc->mach->udc_command(PXA2XX_UDC_CMD_DISCONNECT); -+ if (udc->mach->udc_command) -+ udc->mach->udc_command(PXA2XX_UDC_CMD_DISCONNECT); - } - - /** diff --git a/usb.current/usb-serial-ch341-new-vid-pid-for-ch341-usb-serial.patch b/usb.current/usb-serial-ch341-new-vid-pid-for-ch341-usb-serial.patch deleted file mode 100644 index c79597da97cba8..00000000000000 --- a/usb.current/usb-serial-ch341-new-vid-pid-for-ch341-usb-serial.patch +++ /dev/null @@ -1,33 +0,0 @@ -From mrobbins@MIT.EDU Mon May 19 17:07:10 2008 -From: "Michael F. Robbins" <mrobbins@MIT.EDU> -Date: Fri, 16 May 2008 23:48:42 -0400 -Subject: USB: serial: ch341: New VID/PID for CH341 USB-serial -To: gregkh@suse.de -Cc: hevans@MIT.EDU, frank@kingswood-consulting.co.uk -Message-ID: <1210996122.3530.13.camel@maximum-entropy.mit.edu> - - -Recent USB-serial devices using the WinChipHead CH340/CH341 chipset are -being shipped with a new vendor/product ID code pair, but an otherwise -identical device. (This is confirmed by looking at INF for the included -Windows driver.) - -Patch is tested and working, both with new and old devices. - -Signed-off-by: Michael F. Robbins <mrobbins@mit.edu> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/ch341.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/usb/serial/ch341.c -+++ b/drivers/usb/serial/ch341.c -@@ -28,6 +28,7 @@ static int debug; - - static struct usb_device_id id_table [] = { - { USB_DEVICE(0x4348, 0x5523) }, -+ { USB_DEVICE(0x1a86, 0x7523) }, - { }, - }; - MODULE_DEVICE_TABLE(usb, id_table); diff --git a/usb.current/usb-serial-use-ftdi_sio-driver-for-ratoc-rex-usb60f.patch b/usb.current/usb-serial-use-ftdi_sio-driver-for-ratoc-rex-usb60f.patch deleted file mode 100644 index 131f901b4d6bcb..00000000000000 --- a/usb.current/usb-serial-use-ftdi_sio-driver-for-ratoc-rex-usb60f.patch +++ /dev/null @@ -1,71 +0,0 @@ -From anemo@mba.ocn.ne.jp Fri May 16 10:27:26 2008 -From: Atsushi Nemoto <anemo@mba.ocn.ne.jp> -Date: Sat, 17 May 2008 00:13:56 +0900 (JST) -Subject: usb-serial: Use ftdi_sio driver for RATOC REX-USB60F -To: akirat@rd.scei.sony.co.jp -Cc: gregkh@suse.de, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org -Message-ID: <20080517.001356.72708524.anemo@mba.ocn.ne.jp> - -From: Atsushi Nemoto <anemo@mba.ocn.ne.jp> - -This patch reverts 57833ea6b95a3995149f1f6d1a8d8862ab7a0ba2 -("usb-serial: pl2303: add support for RATOC REX-USB60F") and adds -support for the device to ftdi_sio driver. - -Cc: Akira Tsukamoto <akirat@rd.scei.sony.co.jp> -Cc: stable <stable@kernel.org> -Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/ftdi_sio.c | 1 + - drivers/usb/serial/ftdi_sio.h | 6 ++++++ - drivers/usb/serial/pl2303.c | 1 - - drivers/usb/serial/pl2303.h | 1 - - 4 files changed, 7 insertions(+), 2 deletions(-) - ---- a/drivers/usb/serial/ftdi_sio.c -+++ b/drivers/usb/serial/ftdi_sio.c -@@ -374,6 +374,7 @@ static struct usb_device_id id_table_com - .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, - { USB_DEVICE(FTDI_VID, FTDI_OOCDLINK_PID), - .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, -+ { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID_USB60F) }, - { }, /* Optional parameter entry */ - { } /* Terminating entry */ - }; ---- a/drivers/usb/serial/ftdi_sio.h -+++ b/drivers/usb/serial/ftdi_sio.h -@@ -592,6 +592,12 @@ - #define FIC_NEO1973_DEBUG_PID 0x5118 - - /* -+ * RATOC REX-USB60F -+ */ -+#define RATOC_VENDOR_ID 0x0584 -+#define RATOC_PRODUCT_ID_USB60F 0xb020 -+ -+/* - * BmRequestType: 1100 0000b - * bRequest: FTDI_E2_READ - * wValue: 0 ---- a/drivers/usb/serial/pl2303.c -+++ b/drivers/usb/serial/pl2303.c -@@ -66,7 +66,6 @@ static struct usb_device_id id_table [] - { USB_DEVICE(ITEGNO_VENDOR_ID, ITEGNO_PRODUCT_ID_2080) }, - { USB_DEVICE(MA620_VENDOR_ID, MA620_PRODUCT_ID) }, - { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID) }, -- { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID_USB60F) }, - { USB_DEVICE(TRIPP_VENDOR_ID, TRIPP_PRODUCT_ID) }, - { USB_DEVICE(RADIOSHACK_VENDOR_ID, RADIOSHACK_PRODUCT_ID) }, - { USB_DEVICE(DCU10_VENDOR_ID, DCU10_PRODUCT_ID) }, ---- a/drivers/usb/serial/pl2303.h -+++ b/drivers/usb/serial/pl2303.h -@@ -36,7 +36,6 @@ - - #define RATOC_VENDOR_ID 0x0584 - #define RATOC_PRODUCT_ID 0xb000 --#define RATOC_PRODUCT_ID_USB60F 0xb020 - - #define TRIPP_VENDOR_ID 0x2478 - #define TRIPP_PRODUCT_ID 0x2008 @@ -1 +1 @@ -2.6.26-rc3 +2.6.26-rc3-git3 |