}
        }
 
+       ssif_info->client = client;
+       i2c_set_clientdata(client, ssif_info);
+
        rv = ssif_check_and_remove(client, ssif_info);
        /* If rv is 0 and addr source is not SI_ACPI, continue probing */
        if (!rv && ssif_info->addr_source == SI_ACPI) {
                ipmi_addr_src_to_str(ssif_info->addr_source),
                client->addr, client->adapter->name, slave_addr);
 
-       ssif_info->client = client;
-       i2c_set_clientdata(client, ssif_info);
-
        /* Now check for system interface capabilities */
        msg[0] = IPMI_NETFN_APP_REQUEST << 2;
        msg[1] = IPMI_GET_SYSTEM_INTERFACE_CAPABILITIES_CMD;
 
                dev_err(&ssif_info->client->dev,
                        "Unable to start IPMI SSIF: %d\n", rv);
+               i2c_set_clientdata(client, NULL);
                kfree(ssif_info);
        }
        kfree(resp);