summaryrefslogtreecommitdiffstats
path: root/drivers/ata/libata-sff.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2017-04-04 11:31:12 +0200
committerThomas Gleixner <tglx@linutronix.de>2017-04-04 11:31:12 +0200
commit38bffdac071b720db627bfd2b125a2802a04d419 (patch)
treec2e9cf66fa6ff1cc3092079e3eedeb4e6c402227 /drivers/ata/libata-sff.c
parentlocking/ww-mutex: Limit stress test to 2 seconds (diff)
parentsched/fair: Optimize ___update_sched_avg() (diff)
downloadlinux-38bffdac071b720db627bfd2b125a2802a04d419.tar.xz
linux-38bffdac071b720db627bfd2b125a2802a04d419.zip
Merge branch 'sched/core' into locking/core
Required for the rtmutex/sched_deadline patches which depend on both branches
Diffstat (limited to 'drivers/ata/libata-sff.c')
-rw-r--r--drivers/ata/libata-sff.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 2bd92dca3e62..274d6d7193d7 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -1482,7 +1482,6 @@ unsigned int ata_sff_qc_issue(struct ata_queued_cmd *qc)
break;
default:
- WARN_ON_ONCE(1);
return AC_ERR_SYSTEM;
}