diff options
4 files changed, 13 insertions, 9 deletions
diff --git a/driver-core/block-make-blk_lookup_devt-use-the-class-iterator-function.patch b/driver-core/block-make-blk_lookup_devt-use-the-class-iterator-function.patch index d237a16ca8f751..52c2d380b8fbaf 100644 --- a/driver-core/block-make-blk_lookup_devt-use-the-class-iterator-function.patch +++ b/driver-core/block-make-blk_lookup_devt-use-the-class-iterator-function.patch @@ -10,12 +10,12 @@ internals of the class structures. Cc: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - block/genhd.c | 34 ++++++++++++++++++++++++---------- - 1 file changed, 24 insertions(+), 10 deletions(-) + block/genhd.c | 38 ++++++++++++++++++++++++++------------ + 1 file changed, 26 insertions(+), 12 deletions(-) --- a/block/genhd.c +++ b/block/genhd.c -@@ -665,22 +665,36 @@ void genhd_media_change_notify(struct ge +@@ -665,24 +665,38 @@ void genhd_media_change_notify(struct ge EXPORT_SYMBOL_GPL(genhd_media_change_notify); #endif /* 0 */ @@ -28,6 +28,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +{ + struct find_block *find = data; + ++ if (dev->type != &disk_type) ++ return 0; + if (strcmp(dev->bus_id, find->name) == 0) { + struct gendisk *disk = dev_to_disk(dev); + if (find->part < disk->minors) @@ -44,6 +46,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> mutex_lock(&block_class_lock); - list_for_each_entry(dev, &block_class.devices, node) { +- if (dev->type != &disk_type) +- continue; - if (strcmp(dev->bus_id, name) == 0) { - struct gendisk *disk = dev_to_disk(dev); - diff --git a/driver-core/driver-core-prepare-for-removal-of-20-char-limit-from-struct-device.patch b/driver-core/driver-core-prepare-for-removal-of-20-char-limit-from-struct-device.patch index 455245051a6f57..53355604cc1762 100644 --- a/driver-core/driver-core-prepare-for-removal-of-20-char-limit-from-struct-device.patch +++ b/driver-core/driver-core-prepare-for-removal-of-20-char-limit-from-struct-device.patch @@ -406,10 +406,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> * we need a proper transport to send commands, not a stacked device --- a/block/genhd.c +++ b/block/genhd.c -@@ -681,7 +681,7 @@ static int match_id(struct device *dev, - { - struct find_block *find = data; +@@ -683,7 +683,7 @@ static int match_id(struct device *dev, + if (dev->type != &disk_type) + return 0; - if (strcmp(dev->bus_id, find->name) == 0) { + if (strcmp(dev_name(dev), find->name) == 0) { struct gendisk *disk = dev_to_disk(dev); diff --git a/usb/wusb-whci-hcd-driver.patch b/usb/wusb-whci-hcd-driver.patch index a2923bfc78e246..6eb4920b3afbf0 100644 --- a/usb/wusb-whci-hcd-driver.patch +++ b/usb/wusb-whci-hcd-driver.patch @@ -41,8 +41,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +++ b/drivers/usb/host/Kconfig @@ -305,3 +305,15 @@ config SUPERH_ON_CHIP_R8A66597 help - Renesas SuperH processor has USB like the R8A66597. - This driver supported processor is SH7366. + This driver enables support for the on-chip R8A66597 in the + SH7366 and SH7723 processors. + +config USB_WHCI_HCD + tristate "Wireless USB Host Controller Interface (WHCI) driver" @@ -1 +1 @@ -2.6.26-rc5-git2 +2.6.26-rc5-git3 |