Merge remote-tracking branch 'input-current/for-linus'

[karo-tx-linux.git] / drivers / net / ieee802154 / atusb.c

diff --git a/drivers/net/ieee802154/atusb.c b/drivers/net/ieee802154/atusb.c
index 80dfc725b8dc4d7efca4dbc23e891e13b423a839..199a94a9c8bcf83aeb78c5e694808a71227a1789 100644 (file)
--- a/drivers/net/ieee802154/atusb.c
+++ b/drivers/net/ieee802154/atusb.c
@@ -559,6 +559,7 @@ static int atusb_get_and_show_chip(struct atusb *atusb)
 {
        struct usb_device *usb_dev = atusb->usb_dev;
        uint8_t man_id_0, man_id_1, part_num, version_num;
+       const char *chip;
 
        man_id_0 = atusb_read_reg(atusb, RG_MAN_ID_0);
        man_id_1 = atusb_read_reg(atusb, RG_MAN_ID_1);
@@ -574,14 +575,22 @@ static int atusb_get_and_show_chip(struct atusb *atusb)
                        man_id_1, man_id_0);
                goto fail;
        }
-       if (part_num != 3 && part_num != 2) {
+
+       switch (part_num) {
+       case 2:
+               chip = "AT86RF230";
+               break;
+       case 3:
+               chip = "AT86RF231";
+               break;
+       default:
                dev_err(&usb_dev->dev,
                        "unexpected transceiver, part 0x%02x version 0x%02x\n",
                        part_num, version_num);
                goto fail;
        }
 
-       dev_info(&usb_dev->dev, "ATUSB: AT86RF231 version %d\n", version_num);
+       dev_info(&usb_dev->dev, "ATUSB: %s version %d\n", chip, version_num);
 
        return 0;