2 files changed, 2 insertions, 10 deletions

diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
index 7415d2e6b3a1..e61e25fda1ad 100644
--- a/drivers/oprofile/buffer_sync.c
+++ b/drivers/oprofile/buffer_sync.c
@@ -557,11 +557,9 @@ void sync_buffer(int cpu)
                                 break;
 #ifdef CONFIG_OPROFILE_IBS
                         case IBS_FETCH_BEGIN:
-                                state = sb_bt_start;
                                 add_ibs_begin(cpu, IBS_FETCH_CODE, mm);
                                 break;
                         case IBS_OP_BEGIN:
-                                state = sb_bt_start;
                                 add_ibs_begin(cpu, IBS_OP_CODE, mm);
                                 break;
 #endif
diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c
index 8ae37c9d0ec4..92bf8c0d86fe 100644
--- a/drivers/oprofile/cpu_buffer.c
+++ b/drivers/oprofile/cpu_buffer.c
@@ -347,17 +347,11 @@ void oprofile_add_ibs_sample(struct pt_regs * const regs,
                 fail = fail || add_sample(cpu_buf, ibs_sample[10], ibs_sample[11]);
         }
 
-        if (fail)
-                goto fail;
-
-        if (oprofile_backtrace_depth)
-                oprofile_ops.backtrace(regs, oprofile_backtrace_depth);
-
-        return;
+        if (!fail)
+                return;
 
 fail:
         cpu_buf->sample_lost_overflow++;
-        return;
 }
 
 #endif