- patches.arch/x86_mce_intel_decode_physical_address.patch:

[linux-flexiantxendom0-3.2.10.git] / drivers / block / cciss.c

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index eb5ff05..51ceaee 100644 (file)
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1588,7 +1588,6 @@ static int cciss_ioctl(struct block_device *bdev, fmode_t mode,
 
                        c->Request = ioc->Request;
                        if (ioc->buf_size > 0) {
-                               int i;
                                for (i = 0; i < sg_used; i++) {
                                        temp64.val =
                                            pci_map_single(host->pdev, buff[i],
@@ -2434,7 +2433,7 @@ static int deregister_disk(ctlr_info_t *h, int drv_index,
 
        /* if it was the last disk, find the new hightest lun */
        if (clear_all && recalculate_highest_lun) {
-               int i, newhighest = -1;
+               int newhighest = -1;
                for (i = 0; i <= h->highest_lun; i++) {
                        /* if the disk has size > 0, it is available */
                        if (h->drv[i] && h->drv[i]->heads)