diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-01 07:40:47 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-01 07:40:47 +0200 |
commit | b63d443be43bd64392fc72f6cae01249c3c3683e (patch) | |
tree | b332614cc725ce0fe8fae16c7f262e9e8501fd29 /drivers/net/ethernet/chelsio/cxgb4/sge.c | |
parent | 0eae4686a128d87503863a261e84887750c8bc68 (diff) | |
parent | 79a3aaa7b82e3106be97842dedfd8429248896e6 (diff) | |
download | linux-next-b63d443be43bd64392fc72f6cae01249c3c3683e.tar.gz |
Merge 5.1-rc3 into tty-next
We want the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/chelsio/cxgb4/sge.c')
-rw-r--r-- | drivers/net/ethernet/chelsio/cxgb4/sge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c index 88773ca58e6b..b3da81e90132 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/sge.c +++ b/drivers/net/ethernet/chelsio/cxgb4/sge.c @@ -476,7 +476,7 @@ static inline int get_buf_size(struct adapter *adapter, break; default: - BUG_ON(1); + BUG(); } return buf_size; |