From: Greg Kroah-Hartman Date: Mon, 26 Nov 2012 21:26:06 +0000 (-0800) Subject: 3.0-stable patches X-Git-Tag: v3.6.9~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=215eee95f579a71acdeb28ffe7bd4819e6897909;p=thirdparty%2Fkernel%2Fstable-queue.git 3.0-stable patches added patches: alsa-pcmcia-use-pcmcia_request_irq.patch drivers-block-dac960-fix-dac960_v2_ioctl_opcode_t-wenum-compare-warning.patch drivers-block-dac960-fix-wuninitialized-warning.patch ifenslave-fix-unused-variable-warnings.patch riva-fbdev-fix-several-wuninitialized.patch --- diff --git a/queue-3.0/alsa-pcmcia-use-pcmcia_request_irq.patch b/queue-3.0/alsa-pcmcia-use-pcmcia_request_irq.patch new file mode 100644 index 00000000000..20547d3ae7c --- /dev/null +++ b/queue-3.0/alsa-pcmcia-use-pcmcia_request_irq.patch @@ -0,0 +1,42 @@ +From 08ef79490dad6b88010e94795cf9f89b018ed504 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Tue, 14 Jun 2011 15:57:08 +0200 +Subject: ALSA: pcmcia - Use pcmcia_request_irq() + +From: Takashi Iwai + +commit 08ef79490dad6b88010e94795cf9f89b018ed504 upstream. + +The drivers don't require the exclusive irqs. Let's fix the deprecated +warnings. + +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pcmcia/pdaudiocf/pdaudiocf.c | 2 +- + sound/pcmcia/vx/vxpocket.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- a/sound/pcmcia/pdaudiocf/pdaudiocf.c ++++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c +@@ -223,7 +223,7 @@ static int pdacf_config(struct pcmcia_de + if (ret) + goto failed; + +- ret = pcmcia_request_exclusive_irq(link, pdacf_interrupt); ++ ret = pcmcia_request_irq(link, pdacf_interrupt); + if (ret) + goto failed; + +--- a/sound/pcmcia/vx/vxpocket.c ++++ b/sound/pcmcia/vx/vxpocket.c +@@ -229,7 +229,7 @@ static int vxpocket_config(struct pcmcia + if (ret) + goto failed; + +- ret = pcmcia_request_exclusive_irq(link, snd_vx_irq_handler); ++ ret = pcmcia_request_irq(link, snd_vx_irq_handler); + if (ret) + goto failed; + diff --git a/queue-3.0/drivers-block-dac960-fix-dac960_v2_ioctl_opcode_t-wenum-compare-warning.patch b/queue-3.0/drivers-block-dac960-fix-dac960_v2_ioctl_opcode_t-wenum-compare-warning.patch new file mode 100644 index 00000000000..bb8e9758d3a --- /dev/null +++ b/queue-3.0/drivers-block-dac960-fix-dac960_v2_ioctl_opcode_t-wenum-compare-warning.patch @@ -0,0 +1,89 @@ +From bca505f1097c725708ddc055cf8055e922b0904b Mon Sep 17 00:00:00 2001 +From: Danny Kukawka +Date: Fri, 2 Mar 2012 10:48:32 +0100 +Subject: drivers/block/DAC960: fix DAC960_V2_IOCTL_Opcode_T -Wenum-compare warning + +From: Danny Kukawka + +commit bca505f1097c725708ddc055cf8055e922b0904b upstream. + +Fixed compiler warning: + +comparison between ‘DAC960_V2_IOCTL_Opcode_T’ and ‘enum ’ + +Renamed enum, added a new enum for SCSI_10.CommandOpcode in +DAC960_V2_ProcessCompletedCommand(). + +Signed-off-by: Danny Kukawka +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/block/DAC960.c | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +--- a/drivers/block/DAC960.c ++++ b/drivers/block/DAC960.c +@@ -4627,7 +4627,8 @@ static void DAC960_V2_ProcessCompletedCo + DAC960_Controller_T *Controller = Command->Controller; + DAC960_CommandType_T CommandType = Command->CommandType; + DAC960_V2_CommandMailbox_T *CommandMailbox = &Command->V2.CommandMailbox; +- DAC960_V2_IOCTL_Opcode_T CommandOpcode = CommandMailbox->Common.IOCTL_Opcode; ++ DAC960_V2_IOCTL_Opcode_T IOCTLOpcode = CommandMailbox->Common.IOCTL_Opcode; ++ DAC960_V2_CommandOpcode_T CommandOpcode = CommandMailbox->SCSI_10.CommandOpcode; + DAC960_V2_CommandStatus_T CommandStatus = Command->V2.CommandStatus; + + if (CommandType == DAC960_ReadCommand || +@@ -4699,7 +4700,7 @@ static void DAC960_V2_ProcessCompletedCo + { + if (Controller->ShutdownMonitoringTimer) + return; +- if (CommandOpcode == DAC960_V2_GetControllerInfo) ++ if (IOCTLOpcode == DAC960_V2_GetControllerInfo) + { + DAC960_V2_ControllerInfo_T *NewControllerInfo = + Controller->V2.NewControllerInformation; +@@ -4719,14 +4720,14 @@ static void DAC960_V2_ProcessCompletedCo + memcpy(ControllerInfo, NewControllerInfo, + sizeof(DAC960_V2_ControllerInfo_T)); + } +- else if (CommandOpcode == DAC960_V2_GetEvent) ++ else if (IOCTLOpcode == DAC960_V2_GetEvent) + { + if (CommandStatus == DAC960_V2_NormalCompletion) { + DAC960_V2_ReportEvent(Controller, Controller->V2.Event); + } + Controller->V2.NextEventSequenceNumber++; + } +- else if (CommandOpcode == DAC960_V2_GetPhysicalDeviceInfoValid && ++ else if (IOCTLOpcode == DAC960_V2_GetPhysicalDeviceInfoValid && + CommandStatus == DAC960_V2_NormalCompletion) + { + DAC960_V2_PhysicalDeviceInfo_T *NewPhysicalDeviceInfo = +@@ -4915,7 +4916,7 @@ static void DAC960_V2_ProcessCompletedCo + NewPhysicalDeviceInfo->LogicalUnit++; + Controller->V2.PhysicalDeviceIndex++; + } +- else if (CommandOpcode == DAC960_V2_GetPhysicalDeviceInfoValid) ++ else if (IOCTLOpcode == DAC960_V2_GetPhysicalDeviceInfoValid) + { + unsigned int DeviceIndex; + for (DeviceIndex = Controller->V2.PhysicalDeviceIndex; +@@ -4938,7 +4939,7 @@ static void DAC960_V2_ProcessCompletedCo + } + Controller->V2.NeedPhysicalDeviceInformation = false; + } +- else if (CommandOpcode == DAC960_V2_GetLogicalDeviceInfoValid && ++ else if (IOCTLOpcode == DAC960_V2_GetLogicalDeviceInfoValid && + CommandStatus == DAC960_V2_NormalCompletion) + { + DAC960_V2_LogicalDeviceInfo_T *NewLogicalDeviceInfo = +@@ -5065,7 +5066,7 @@ static void DAC960_V2_ProcessCompletedCo + [LogicalDeviceNumber] = true; + NewLogicalDeviceInfo->LogicalDeviceNumber++; + } +- else if (CommandOpcode == DAC960_V2_GetLogicalDeviceInfoValid) ++ else if (IOCTLOpcode == DAC960_V2_GetLogicalDeviceInfoValid) + { + int LogicalDriveNumber; + for (LogicalDriveNumber = 0; diff --git a/queue-3.0/drivers-block-dac960-fix-wuninitialized-warning.patch b/queue-3.0/drivers-block-dac960-fix-wuninitialized-warning.patch new file mode 100644 index 00000000000..66cadf4939a --- /dev/null +++ b/queue-3.0/drivers-block-dac960-fix-wuninitialized-warning.patch @@ -0,0 +1,37 @@ +From cecd353a02fb1405c8a72a324b26b5acf97e7411 Mon Sep 17 00:00:00 2001 +From: Danny Kukawka +Date: Fri, 2 Mar 2012 10:48:35 +0100 +Subject: drivers/block/DAC960: fix -Wuninitialized warning + +From: Danny Kukawka + +commit cecd353a02fb1405c8a72a324b26b5acf97e7411 upstream. + +Set CommandMailbox with memset before use it. Fix for: + +drivers/block/DAC960.c: In function ‘DAC960_V1_EnableMemoryMailboxInterface’: +arch/x86/include/asm/io.h:61:1: warning: ‘CommandMailbox.Bytes[12]’ + may be used uninitialized in this function [-Wuninitialized] +drivers/block/DAC960.c:1175:30: note: ‘CommandMailbox.Bytes[12]’ + was declared here + +Signed-off-by: Danny Kukawka +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/block/DAC960.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/block/DAC960.c ++++ b/drivers/block/DAC960.c +@@ -1177,7 +1177,8 @@ static bool DAC960_V1_EnableMemoryMailbo + int TimeoutCounter; + int i; + +- ++ memset(&CommandMailbox, 0, sizeof(DAC960_V1_CommandMailbox_T)); ++ + if (pci_set_dma_mask(Controller->PCIDevice, DMA_BIT_MASK(32))) + return DAC960_Failure(Controller, "DMA mask out of range"); + Controller->BounceBufferLimit = DMA_BIT_MASK(32); diff --git a/queue-3.0/ifenslave-fix-unused-variable-warnings.patch b/queue-3.0/ifenslave-fix-unused-variable-warnings.patch new file mode 100644 index 00000000000..2fbb2bd4781 --- /dev/null +++ b/queue-3.0/ifenslave-fix-unused-variable-warnings.patch @@ -0,0 +1,40 @@ +From 450faacc621dbe0a4945ed8292afd45f4602d263 Mon Sep 17 00:00:00 2001 +From: "David S. Miller" +Date: Sat, 26 Nov 2011 16:54:17 -0500 +Subject: ifenslave: Fix unused variable warnings. + +From: "David S. Miller" + +commit 450faacc621dbe0a4945ed8292afd45f4602d263 upstream. + +Documentation/networking/ifenslave.c: In function ‘if_getconfig’: +Documentation/networking/ifenslave.c:508:14: warning: variable ‘mtu’ set but not used [-Wunused-but-set-variable] +Documentation/networking/ifenslave.c:508:6: warning: variable ‘metric’ set but not used [-Wunused-but-set-variable] + +The purpose of this function is to simply print out the values +it probes, so... + +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + Documentation/networking/ifenslave.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/Documentation/networking/ifenslave.c ++++ b/Documentation/networking/ifenslave.c +@@ -539,12 +539,14 @@ static int if_getconfig(char *ifname) + metric = 0; + } else + metric = ifr.ifr_metric; ++ printf("The result of SIOCGIFMETRIC is %d\n", metric); + + strcpy(ifr.ifr_name, ifname); + if (ioctl(skfd, SIOCGIFMTU, &ifr) < 0) + mtu = 0; + else + mtu = ifr.ifr_mtu; ++ printf("The result of SIOCGIFMTU is %d\n", mtu); + + strcpy(ifr.ifr_name, ifname); + if (ioctl(skfd, SIOCGIFDSTADDR, &ifr) < 0) { diff --git a/queue-3.0/riva-fbdev-fix-several-wuninitialized.patch b/queue-3.0/riva-fbdev-fix-several-wuninitialized.patch new file mode 100644 index 00000000000..dafe65a22cc --- /dev/null +++ b/queue-3.0/riva-fbdev-fix-several-wuninitialized.patch @@ -0,0 +1,42 @@ +From c718a54649475cc397484f96e70f6d0fdd267165 Mon Sep 17 00:00:00 2001 +From: Danny Kukawka +Date: Mon, 30 Jan 2012 23:00:17 +0100 +Subject: riva/fbdev: fix several -Wuninitialized + +From: Danny Kukawka + +commit c718a54649475cc397484f96e70f6d0fdd267165 upstream. + +Fix several -Wuninitialized compiler warnings by changing the +order of getting modedb in riva_update_default_var() to set +first the fallback and then the prefered timing. + +Signed-off-by: Danny Kukawka +Signed-off-by: Florian Tobias Schandinat +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/video/riva/fbdev.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +--- a/drivers/video/riva/fbdev.c ++++ b/drivers/video/riva/fbdev.c +@@ -1816,6 +1816,8 @@ static void __devinit riva_update_defaul + specs->modedb, specs->modedb_len, + NULL, 8); + } else if (specs->modedb != NULL) { ++ /* get first mode in database as fallback */ ++ modedb = specs->modedb[0]; + /* get preferred timing */ + if (info->monspecs.misc & FB_MISC_1ST_DETAIL) { + int i; +@@ -1826,9 +1828,6 @@ static void __devinit riva_update_defaul + break; + } + } +- } else { +- /* otherwise, get first mode in database */ +- modedb = specs->modedb[0]; + } + var->bits_per_pixel = 8; + riva_update_var(var, &modedb); diff --git a/queue-3.0/series b/queue-3.0/series new file mode 100644 index 00000000000..07f59b7985f --- /dev/null +++ b/queue-3.0/series @@ -0,0 +1,5 @@ +alsa-pcmcia-use-pcmcia_request_irq.patch +drivers-block-dac960-fix-dac960_v2_ioctl_opcode_t-wenum-compare-warning.patch +drivers-block-dac960-fix-wuninitialized-warning.patch +riva-fbdev-fix-several-wuninitialized.patch +ifenslave-fix-unused-variable-warnings.patch