From: Greg Kroah-Hartman Date: Mon, 5 Oct 2009 16:30:56 +0000 (-0700) Subject: some .31 review patch fixes found. X-Git-Tag: v2.6.31.2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4abe3b8baac275a871ccd10949ccfa0c3a1b39cf;p=thirdparty%2Fkernel%2Fstable-queue.git some .31 review patch fixes found. --- diff --git a/review-2.6.31/fix-null-ptr-regression-in-powernow-k8.patch b/review-2.6.31/fix-null-ptr-regression-in-powernow-k8.patch index f0c6d849a3a..d04fd506f09 100644 --- a/review-2.6.31/fix-null-ptr-regression-in-powernow-k8.patch +++ b/review-2.6.31/fix-null-ptr-regression-in-powernow-k8.patch @@ -14,8 +14,8 @@ Signed-off-by: Dave Jones Signed-off-by: Greg Kroah-Hartman --- - 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 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 diff --git a/review-2.6.31/usb-serial-straighten-out-serial_open.patch b/review-2.6.31/usb-serial-straighten-out-serial_open.patch index 24921bc11c5..7fd7be64d94 100644 --- a/review-2.6.31/usb-serial-straighten-out-serial_open.patch +++ b/review-2.6.31/usb-serial-straighten-out-serial_open.patch @@ -73,7 +73,7 @@ Signed-off-by: Greg Kroah-Hartman + 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)