drivers/misc/ti-st: Load firmware from ti-connectivity directory.

Looks like the default location for TI firmware is inside the ti-connectivity
directory, to be coherent with other firmware request used by TI drivers, load
the TIInit firmware from this directory instead of /lib/firmware directly.

Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/ti-st/st_kim.c b/drivers/misc/ti-st/st_kim.c
index 45007be7cfb74b27767dda7d9eeec49694b6955a..21c2337bad68476f1618b9e91e6c4d103c20a64a 100644 (file)
--- a/drivers/misc/ti-st/st_kim.c
+++ b/drivers/misc/ti-st/st_kim.c
@@ -244,7 +244,8 @@ static long read_local_version(struct kim_data_s *kim_gdata, char *bts_scr_name)
        if (version & 0x8000)
                maj_ver |= 0x0008;
 
-       sprintf(bts_scr_name, "TIInit_%d.%d.%d.bts", chip, maj_ver, min_ver);
+       sprintf(bts_scr_name, "ti-connectivity/TIInit_%d.%d.%d.bts",
+               chip, maj_ver, min_ver);
 
        /* to be accessed later via sysfs entry */
        kim_gdata->version.full = version;
@@ -287,7 +288,7 @@ static long download_firmware(struct kim_data_s *kim_gdata)
        long len = 0;
        unsigned char *ptr = NULL;
        unsigned char *action_ptr = NULL;
-       unsigned char bts_scr_name[30] = { 0 }; /* 30 char long bts scr name? */
+       unsigned char bts_scr_name[40] = { 0 }; /* 40 char long bts scr name? */
        int wr_room_space;
        int cmd_size;
        unsigned long timeout;