greybus: protocol: fix oops when no protocol is assigned

When removing a connection with no protocol assigned to it, the kernel
oopses as we always thought protocols were always there.

Fix that problem, oopses are bad.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Reviewed-by: Alex Elder <elder@linaro.org>

diff --git a/drivers/staging/greybus/protocol.c b/drivers/staging/greybus/protocol.c
index 4d6ffdd04ab83ce268be44ea36dc2db7887d6607..562401d77d6d76c4c77dc924aa9928cb3d15a3a8 100644 (file)
--- a/drivers/staging/greybus/protocol.c
+++ b/drivers/staging/greybus/protocol.c
@@ -165,10 +165,16 @@ struct gb_protocol *gb_protocol_get(u8 id, u8 major, u8 minor)
 
 void gb_protocol_put(struct gb_protocol *protocol)
 {
-       u8 major = protocol->major;
-       u8 minor = protocol->minor;
+       u8 major;
+       u8 minor;
        u8 protocol_count;
 
+       if (!protocol)
+               return;
+
+       major = protocol->major;
+       minor = protocol->minor;
+
        spin_lock_irq(&gb_protocols_lock);
        protocol = _gb_protocol_find(protocol->id, protocol->major,
                                                protocol->minor);