Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-02 17:48:54 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into usbhub

Browse Source
This commit is contained in:
Gregory Nutt
2015-04-27 12:27:43 -06:00
parent 24761dea0b cec90e144a
commit 6e20a466ac
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/usbhost/usbhost_storage.c
+1 -1
View File
@@ -1632,7 +1632,7 @@ static FAR struct usbmsc_cbw_s *usbhost_cbwalloc(FAR struct usbhost_state_s *pri
{ {
FAR struct usbmsc_cbw_s *cbw = NULL; FAR struct usbmsc_cbw_s *cbw = NULL;
DEBUGASSERT(priv->tbuffer && priv->tbuflen >= sizeof(struct usbmsc_cbw_s)) DEBUGASSERT(priv->tbuffer && priv->tbuflen >= sizeof(struct usbmsc_cbw_s));
/* Initialize the CBW sructure */ /* Initialize the CBW sructure */
net/socket/recvfrom.c
+1 -1
View File
@@ -960,7 +960,6 @@ static inline void recvfrom_udpsender(struct net_driver_s *dev, struct recvfrom_
{ {
FAR struct sockaddr_in *infrom = FAR struct sockaddr_in *infrom =
(FAR struct sockaddr_in *)pstate->rf_from; (FAR struct sockaddr_in *)pstate->rf_from;
FAR socklen_t *fromlen = pstate->rf_fromlen;
if (infrom) if (infrom)
{ {
@@ -977,6 +976,7 @@ static inline void recvfrom_udpsender(struct net_driver_s *dev, struct recvfrom_
if (conn->domain == PF_INET6) if (conn->domain == PF_INET6)
{ {
FAR socklen_t *fromlen = pstate->rf_fromlen;
in_addr_t ipv4addr; in_addr_t ipv4addr;
/* Encode the IPv4 address as an IPv4-mapped IPv6 address */ /* Encode the IPv4 address as an IPv4-mapped IPv6 address */