Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'hsi-for-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
Pull HSI updates from Sebastian Reichel:
- misc small fixes
* tag 'hsi-for-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
HSI: omap_ssi_core: Fix error handling in ssi_init()
headers: Remove some left-over license text in include/uapi/linux/hsi/
HSI: omap_ssi_core: fix possible memory leak in ssi_probe()
HSI: omap_ssi_core: fix unbalanced pm_runtime_disable()
HSI: ssi_protocol: Fix return type of ssip_pn_xmit()
+14
-34
+3
-3
drivers/hsi/clients/ssi_protocol.c
+3
-3
drivers/hsi/clients/ssi_protocol.c
···
968
968
ssip_xmit(cl);
969
969
}
970
970
971
-
static int ssip_pn_xmit(struct sk_buff *skb, struct net_device *dev)
971
+
static netdev_tx_t ssip_pn_xmit(struct sk_buff *skb, struct net_device *dev)
972
972
{
973
973
struct hsi_client *cl = to_hsi_client(dev->dev.parent);
974
974
struct ssi_protocol *ssi = hsi_client_drvdata(cl);
···
1027
1027
dev->stats.tx_packets++;
1028
1028
dev->stats.tx_bytes += skb->len;
1029
1029
1030
-
return 0;
1030
+
return NETDEV_TX_OK;
1031
1031
drop2:
1032
1032
hsi_free_msg(msg);
1033
1033
drop:
···
1035
1035
inc_dropped:
1036
1036
dev->stats.tx_dropped++;
1037
1037
1038
-
return 0;
1038
+
return NETDEV_TX_OK;
1039
1039
}
1040
1040
1041
1041
/* CMT reset event handler */
+11
-3
drivers/hsi/controllers/omap_ssi_core.c
+11
-3
drivers/hsi/controllers/omap_ssi_core.c
···
502
502
platform_set_drvdata(pd, ssi);
503
503
504
504
err = ssi_add_controller(ssi, pd);
505
-
if (err < 0)
505
+
if (err < 0) {
506
+
hsi_put_controller(ssi);
506
507
goto out1;
508
+
}
507
509
508
510
pm_runtime_enable(&pd->dev);
509
511
···
538
536
device_for_each_child(&pd->dev, NULL, ssi_remove_ports);
539
537
out2:
540
538
ssi_remove_controller(ssi);
539
+
pm_runtime_disable(&pd->dev);
541
540
out1:
542
541
platform_set_drvdata(pd, NULL);
543
-
pm_runtime_disable(&pd->dev);
544
542
545
543
return err;
546
544
}
···
631
629
if (ret)
632
630
return ret;
633
631
634
-
return platform_driver_register(&ssi_port_pdriver);
632
+
ret = platform_driver_register(&ssi_port_pdriver);
633
+
if (ret) {
634
+
platform_driver_unregister(&ssi_pdriver);
635
+
return ret;
636
+
}
637
+
638
+
return 0;
635
639
}
636
640
module_init(ssi_init);
637
641
-14
include/uapi/linux/hsi/cs-protocol.h
-14
include/uapi/linux/hsi/cs-protocol.h
···
6
6
*
7
7
* Contact: Kai Vehmanen <kai.vehmanen@nokia.com>
8
8
* Original author: Peter Ujfalusi <peter.ujfalusi@nokia.com>
9
-
*
10
-
* This program is free software; you can redistribute it and/or
11
-
* modify it under the terms of the GNU General Public License
12
-
* version 2 as published by the Free Software Foundation.
13
-
*
14
-
* This program is distributed in the hope that it will be useful, but
15
-
* WITHOUT ANY WARRANTY; without even the implied warranty of
16
-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17
-
* General Public License for more details.
18
-
*
19
-
* You should have received a copy of the GNU General Public License
20
-
* along with this program; if not, write to the Free Software
21
-
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
22
-
* 02110-1301 USA
23
9
*/
24
10
25
11
#ifndef _CS_PROTOCOL_H
-14
include/uapi/linux/hsi/hsi_char.h
-14
include/uapi/linux/hsi/hsi_char.h
···
5
5
* Copyright (C) 2010 Nokia Corporation. All rights reserved.
6
6
*
7
7
* Contact: Andras Domokos <andras.domokos at nokia.com>
8
-
*
9
-
* This program is free software; you can redistribute it and/or
10
-
* modify it under the terms of the GNU General Public License
11
-
* version 2 as published by the Free Software Foundation.
12
-
*
13
-
* This program is distributed in the hope that it will be useful, but
14
-
* WITHOUT ANY WARRANTY; without even the implied warranty of
15
-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16
-
* General Public License for more details.
17
-
*
18
-
* You should have received a copy of the GNU General Public License
19
-
* along with this program; if not, write to the Free Software
20
-
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
21
-
* 02110-1301 USA
22
8
*/
23
9
24
10
#ifndef __HSI_CHAR_H