aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2008-06-20 21:39:05 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-06-20 21:39:05 -0700
commit84f24e66e46c1ea5ddb9a5b082aad6e35a48c62a (patch)
tree7cb67f1976fec04bd38db50c19dc6c3ea19db5a6
parentc662e6eb25a7965c0a47db88340ac5327f87e068 (diff)
downloadpatches-84f24e66e46c1ea5ddb9a5b082aad6e35a48c62a.tar.gz
2.6.26-rc7
-rw-r--r--driver-core/driver-core-add-ability-for-class_find_device-to-start-in-middle-of-list.patch6
-rw-r--r--version2
2 files changed, 4 insertions, 4 deletions
diff --git a/driver-core/driver-core-add-ability-for-class_find_device-to-start-in-middle-of-list.patch b/driver-core/driver-core-add-ability-for-class_find_device-to-start-in-middle-of-list.patch
index 2c71eb7414af7c..9a2625e107a386 100644
--- a/driver-core/driver-core-add-ability-for-class_find_device-to-start-in-middle-of-list.patch
+++ b/driver-core/driver-core-add-ability-for-class_find_device-to-start-in-middle-of-list.patch
@@ -129,16 +129,16 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
-@@ -462,7 +462,8 @@ struct Scsi_Host *scsi_host_lookup(unsig
+@@ -466,7 +466,8 @@ struct Scsi_Host *scsi_host_lookup(unsig
struct device *cdev;
struct Scsi_Host *shost = ERR_PTR(-ENXIO);
- cdev = class_find_device(&shost_class, &hostnum, __scsi_host_match);
+ cdev = class_find_device(&shost_class, NULL, &hostnum,
+ __scsi_host_match);
- if (cdev)
+ if (cdev) {
shost = scsi_host_get(class_to_shost(cdev));
-
+ put_device(cdev);
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -502,7 +502,7 @@ struct spi_master *spi_busnum_to_master(
diff --git a/version b/version
index dcef4a243e9e24..00aac4d8de0256 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.26-rc6-git5
+2.6.26-rc7