]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
some .31 review patch fixes found.
authorGreg Kroah-Hartman <gregkh@suse.de>
Mon, 5 Oct 2009 16:30:56 +0000 (09:30 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 5 Oct 2009 16:30:56 +0000 (09:30 -0700)
review-2.6.31/fix-null-ptr-regression-in-powernow-k8.patch
review-2.6.31/usb-serial-straighten-out-serial_open.patch

index f0c6d849a3ad0fc6f02d44321f92eafe3bb98769..d04fd506f09763c092f1d1fdc4392b0ebb390053 100644 (file)
@@ -14,8 +14,8 @@ Signed-off-by: Dave Jones <davej@redhat.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 ---
- arch/x86/kernel/cpu/cpufreq/powernow-k8.c |   15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
+ arch/x86/kernel/cpu/cpufreq/powernow-k8.c |   17 +++++++++--------
+ 1 file changed, 9 insertions(+), 8 deletions(-)
 
 --- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
 +++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
@@ -66,6 +66,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
                        continue;
                }
  
+@@ -997,7 +998,7 @@ static int fill_powernow_table_fidvid(st
+                               dprintk("double low frequency table entry, "
+                                               "ignoring it.\n");
+-                              invalidate_entry(data, i);
++                              invalidate_entry(powernow_table, i);
+                               continue;
+                       } else
+                               cntlofreq = i;
 @@ -1009,7 +1010,7 @@ static int fill_powernow_table_fidvid(st
                                (unsigned int)
                                (data->acpi_data.states[i].core_frequency
index 24921bc11c5e0e1915a2a1d57afc8c9edb8f4edc..7fd7be64d94253c83137c1aba0b152cd0bf28977 100644 (file)
@@ -73,7 +73,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +              if (serial->disconnected)
 +                      retval = -ENODEV;
 +              else
-+                      retval = port->serial->type->open(tty, port, flip);
++                      retval = port->serial->type->open(tty, port, filp);
                mutex_unlock(&serial->disc_mutex);
 +              mutex_unlock(&port->mutex);
 +              if (retval)