| Message ID | 20220801042918.292541-1-shraash@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Bluetooth: Replace IS_ERR_OR_NULL with IS_ERR | expand |
| Context | Check | Description |
|---|---|---|
| tedd_an/pre-ci_am | fail | error: patch failed: include/net/bluetooth/bluetooth.h:494 error: include/net/bluetooth/bluetooth.h: patch does not apply hint: Use 'git am --show-current-patch' to see the failed patch |
This is an automated email and please do not reply to this email. Dear Submitter, Thank you for submitting the patches to the linux bluetooth mailing list. While preparing the CI tests, the patches you submitted couldn't be applied to the current HEAD of the repository. ----- Output ----- error: patch failed: include/net/bluetooth/bluetooth.h:494 error: include/net/bluetooth/bluetooth.h: patch does not apply hint: Use 'git am --show-current-patch' to see the failed patch Please resolve the issue and submit the patches again. --- Regards, Linux Bluetooth
On Sun, Jul 31, 2022 at 9:29 PM Aashish Sharma <shraash@google.com> wrote: > > Since bt_skb_sendmsg never returns NULL, replace IS_ERR_OR_NULL > with IS_ERR. > > Signed-off-by: Aashish Sharma <shraash@google.com> Reviewed-by: Guenter Roeck <groeck@chromium.org> > --- > include/net/bluetooth/bluetooth.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h > index 6b48d9e2aab9..a8b52175af05 100644 > --- a/include/net/bluetooth/bluetooth.h > +++ b/include/net/bluetooth/bluetooth.h > @@ -494,7 +494,7 @@ static inline struct sk_buff *bt_skb_sendmmsg(struct sock *sk, > struct sk_buff *skb, **frag; > > skb = bt_skb_sendmsg(sk, msg, len, mtu, headroom, tailroom); > - if (IS_ERR_OR_NULL(skb)) > + if (IS_ERR(skb)) > return skb; > > len -= skb->len; > -- > 2.37.1.455.g008518b4e5-goog >
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h index 6b48d9e2aab9..a8b52175af05 100644 --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h @@ -494,7 +494,7 @@ static inline struct sk_buff *bt_skb_sendmmsg(struct sock *sk, struct sk_buff *skb, **frag; skb = bt_skb_sendmsg(sk, msg, len, mtu, headroom, tailroom); - if (IS_ERR_OR_NULL(skb)) + if (IS_ERR(skb)) return skb; len -= skb->len;
Since bt_skb_sendmsg never returns NULL, replace IS_ERR_OR_NULL with IS_ERR. Signed-off-by: Aashish Sharma <shraash@google.com> --- include/net/bluetooth/bluetooth.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)