Merge branch 'misc' into for-linus

[cascardo/linux.git] / drivers / scsi / st.c

diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index ff44b3c..a1d6986 100644 (file)
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -3719,7 +3719,7 @@ static struct st_buffer *new_tape_buffer(int need_dma, int max_sg)
 
 static int enlarge_buffer(struct st_buffer * STbuffer, int new_size, int need_dma)
 {
-       int segs, nbr, max_segs, b_size, order, got;
+       int segs, max_segs, b_size, order, got;
        gfp_t priority;
 
        if (new_size <= STbuffer->buffer_size)
@@ -3729,9 +3729,6 @@ static int enlarge_buffer(struct st_buffer * STbuffer, int new_size, int need_dm
                normalize_buffer(STbuffer);  /* Avoid extra segment */
 
        max_segs = STbuffer->use_sg;
-       nbr = max_segs - STbuffer->frp_segs;
-       if (nbr <= 0)
-               return 0;
 
        priority = GFP_KERNEL | __GFP_NOWARN;
        if (need_dma)