From: Greg Kroah-Hartman Date: Mon, 28 Mar 2011 18:41:26 +0000 (-0700) Subject: delete broken cciss patch X-Git-Tag: v2.6.38.3~15 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ab931495521602e9e4d52df973cd7be2807df6b;p=thirdparty%2Fkernel%2Fstable-queue.git delete broken cciss patch --- diff --git a/queue-2.6.38/cciss-add-missing-allocation-in-scsi_cmd_stack_setup-and-corresponding-deallocation.patch b/queue-2.6.38/cciss-add-missing-allocation-in-scsi_cmd_stack_setup-and-corresponding-deallocation.patch deleted file mode 100644 index 38e96601567..00000000000 --- a/queue-2.6.38/cciss-add-missing-allocation-in-scsi_cmd_stack_setup-and-corresponding-deallocation.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 978eb516a4e1a1b47163518d6f5d5e81ab27a583 Mon Sep 17 00:00:00 2001 -From: Stephen M. Cameron -Date: Fri, 11 Mar 2011 20:07:38 +0100 -Subject: cciss: Add missing allocation in scsi_cmd_stack_setup and corresponding deallocation - -From: Stephen M. Cameron - -commit 978eb516a4e1a1b47163518d6f5d5e81ab27a583 upstream. - -This bit got lost somewhere along the way. Without this, panic. - -Signed-off-by: Stephen M. Cameron -Signed-off-by: Jens Axboe -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/block/cciss_scsi.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - ---- a/drivers/block/cciss_scsi.c -+++ b/drivers/block/cciss_scsi.c -@@ -226,6 +226,13 @@ scsi_cmd_stack_setup(ctlr_info_t *h, str - return -ENOMEM; - } - -+ stk->elem = kmalloc(sizeof(stk->elem[0]) * stk->nelems, GFP_KERNEL); -+ if (!stk->elem) { -+ pci_free_consistent(h->pdev, size, stk->pool, -+ stk->cmd_pool_handle); -+ return -1; -+ } -+ - for (i=0; ielem[i] = &stk->pool[i]; - stk->elem[i]->busaddr = (__u32) (stk->cmd_pool_handle + -@@ -255,6 +262,8 @@ scsi_cmd_stack_free(ctlr_info_t *h) - pci_free_consistent(h->pdev, size, stk->pool, stk->cmd_pool_handle); - stk->pool = NULL; - cciss_free_sg_chain_blocks(sa->cmd_sg_list, CMD_STACK_SIZE); -+ kfree(stk->elem); -+ stk->elem = NULL; - } - - #if 0 diff --git a/queue-2.6.38/series b/queue-2.6.38/series index 2c63c586a7f..1c68f9056a1 100644 --- a/queue-2.6.38/series +++ b/queue-2.6.38/series @@ -4,7 +4,6 @@ alsa-fix-yet-another-race-in-disconnection.patch alsa-vmalloc-buffers-should-use-normal-mmap.patch perf-better-fit-max-unprivileged-mlock-pages-for-tools-needs.patch myri10ge-fix-rmmod-crash.patch -cciss-add-missing-allocation-in-scsi_cmd_stack_setup-and-corresponding-deallocation.patch cciss-fix-lost-command-issue.patch ath9k-fix-kernel-panic-in-ar2427.patch sound-oss-opl3-validate-voice-and-channel-indexes.patch