Merge tag 'ceph-for-5.11-rc1' of git://github.com/ceph/ceph-client

[linux-2.6-microblaze.git] / net / openvswitch / meter.c

diff --git a/net/openvswitch/meter.c b/net/openvswitch/meter.c
index 8fbefd5..15424d2 100644 (file)
--- a/net/openvswitch/meter.c
+++ b/net/openvswitch/meter.c
@@ -423,7 +423,7 @@ static int ovs_meter_cmd_set(struct sk_buff *skb, struct genl_info *info)
                return -EINVAL;
 
        meter = dp_meter_create(a);
-       if (IS_ERR_OR_NULL(meter))
+       if (IS_ERR(meter))
                return PTR_ERR(meter);
 
        reply = ovs_meter_cmd_reply_start(info, OVS_METER_CMD_SET,