Skip to content

Commit

Permalink
Fix build for GCC 4.7
Browse files Browse the repository at this point in the history
Change-Id: I4e9265369174d82b55fd435bc47887972f99c9d4
  • Loading branch information
dojipkim authored and Iliyan Malchev committed Mar 16, 2013
1 parent 8218669 commit 18c9496
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion drivers/media/common/tuners/xc4000.c
Original file line number Diff line number Diff line change
Expand Up @@ -935,7 +935,7 @@ static int check_firmware(struct dvb_frontend *fe, unsigned int type,
int rc = 0, is_retry = 0;
u16 hwmodel;
v4l2_std_id std0;
u8 hw_major, hw_minor, fw_major, fw_minor;
u8 hw_major = 0, hw_minor = 0, fw_major = 0, fw_minor = 0;

dprintk(1, "%s called\n", __func__);

Expand Down
2 changes: 1 addition & 1 deletion fs/cifs/transport.c
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ SendReceive2(const unsigned int xid, struct cifs_ses *ses,
{
int rc = 0;
int long_op;
struct mid_q_entry *midQ;
struct mid_q_entry *midQ = NULL;
char *buf = iov[0].iov_base;

long_op = flags & CIFS_TIMEOUT_MASK;
Expand Down
10 changes: 5 additions & 5 deletions net/netfilter/xt_socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,9 @@ xt_socket_get4_sk(const struct sk_buff *skb, struct xt_action_param *par)
const struct iphdr *iph = ip_hdr(skb);
struct udphdr _hdr, *hp = NULL;
struct sock *sk;
__be32 daddr, saddr;
__be16 dport, sport;
u8 protocol;
__be32 daddr = 0, saddr = 0;
__be16 dport = 0, sport = 0;
u8 protocol = 0;
#ifdef XT_SOCKET_HAVE_CONNTRACK
struct nf_conn const *ct;
enum ip_conntrack_info ctinfo;
Expand Down Expand Up @@ -273,8 +273,8 @@ xt_socket_get6_sk(const struct sk_buff *skb, struct xt_action_param *par)
struct ipv6hdr *iph = ipv6_hdr(skb);
struct udphdr _hdr, *hp = NULL;
struct sock *sk;
struct in6_addr *daddr, *saddr;
__be16 dport, sport;
struct in6_addr *daddr = NULL, *saddr = NULL;
__be16 dport = 0, sport = 0;
int thoff, tproto;

tproto = ipv6_find_hdr(skb, &thoff, -1, NULL);
Expand Down

0 comments on commit 18c9496

Please sign in to comment.