Skip to content

Commit

Permalink
Fixing some patches that were made for GCC 4.8
Browse files Browse the repository at this point in the history 
Signed-off-by: Bryan Smith <zarboz@gmail.com>
  • Loading branch information
@zarboz
zarboz committed May 9, 2013
1 parent d606c77 commit 0b24406
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion drivers/mmc/core/mmc_ops.c
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ int mmc_set_block_length(struct mmc_card *card, u32 length)
int err; int err;
int retries = 3; int retries = 3;
struct mmc_command cmd; struct mmc_command cmd;
u32 status = {0}; u32 status = 0;
unsigned long delay = jiffies + HZ; unsigned long delay = jiffies + HZ;


BUG_ON(!card); BUG_ON(!card);
Expand Down
4 changes: 2 additions & 2 deletions drivers/usb/storage/transport.c
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ static int usb_stor_bulk_transfer_sglist(struct us_data *us, unsigned int pipe,
int usb_stor_bulk_srb(struct us_data* us, unsigned int pipe, int usb_stor_bulk_srb(struct us_data* us, unsigned int pipe,
struct scsi_cmnd* srb) struct scsi_cmnd* srb)
{ {
unsigned int partial = {0}; unsigned int partial = 0;
int result = usb_stor_bulk_transfer_sglist(us, pipe, scsi_sglist(srb), int result = usb_stor_bulk_transfer_sglist(us, pipe, scsi_sglist(srb),
scsi_sg_count(srb), scsi_bufflen(srb), scsi_sg_count(srb), scsi_bufflen(srb),
&partial); &partial);
Expand All @@ -379,7 +379,7 @@ int usb_stor_bulk_transfer_sg(struct us_data* us, unsigned int pipe,
void *buf, unsigned int length_left, int use_sg, int *residual) void *buf, unsigned int length_left, int use_sg, int *residual)
{ {
int result; int result;
unsigned int partial = {0}; unsigned int partial = 0;


/* are we scatter-gathering? */ /* are we scatter-gathering? */
if (use_sg) { if (use_sg) {
Expand Down
8 changes: 4 additions & 4 deletions net/netfilter/nf_conntrack_h323_main.c
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -558,8 +558,8 @@ static int h245_help(struct sk_buff *skb, unsigned int protoff,
{ {
static MultimediaSystemControlMessage mscm; static MultimediaSystemControlMessage mscm;
unsigned char *data = NULL; unsigned char *data = NULL;
int datalen = {0}; int datalen = 0;
int dataoff = {0}; int dataoff = 0;
int ret; int ret;




Expand Down Expand Up @@ -1094,8 +1094,8 @@ static int q931_help(struct sk_buff *skb, unsigned int protoff,
{ {
static Q931 q931; static Q931 q931;
unsigned char *data = NULL; unsigned char *data = NULL;
int datalen = {0}; int datalen = 0;
int dataoff = {0}; int dataoff = 0;
int ret; int ret;




Expand Down
12 changes: 6 additions & 6 deletions sound/usb/mixer.c
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -881,7 +881,7 @@ static int mixer_ctl_feature_info(struct snd_kcontrol *kcontrol, struct snd_ctl_
static int mixer_ctl_feature_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) static int mixer_ctl_feature_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
struct usb_mixer_elem_info *cval = kcontrol->private_data; struct usb_mixer_elem_info *cval = kcontrol->private_data;
int c, cnt, val = {0}, err; int c, cnt, val = 0, err;


ucontrol->value.integer.value[0] = cval->min; ucontrol->value.integer.value[0] = cval->min;
if (cval->cmask) { if (cval->cmask) {
Expand Down Expand Up @@ -911,7 +911,7 @@ static int mixer_ctl_feature_get(struct snd_kcontrol *kcontrol, struct snd_ctl_e
static int mixer_ctl_feature_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) static int mixer_ctl_feature_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
struct usb_mixer_elem_info *cval = kcontrol->private_data; struct usb_mixer_elem_info *cval = kcontrol->private_data;
int c, cnt, val = {0}, oval, err; int c, cnt, val = 0, oval, err;
int changed = 0; int changed = 0;


if (cval->cmask) { if (cval->cmask) {
Expand Down Expand Up @@ -1308,7 +1308,7 @@ static int parse_audio_mixer_unit(struct mixer_build *state, int unitid, void *r
static int mixer_ctl_procunit_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) static int mixer_ctl_procunit_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
struct usb_mixer_elem_info *cval = kcontrol->private_data; struct usb_mixer_elem_info *cval = kcontrol->private_data;
int err, val = {0}; int err, val = 0;


err = get_cur_ctl_value(cval, cval->control << 8, &val); err = get_cur_ctl_value(cval, cval->control << 8, &val);
if (err < 0 && cval->mixer->ignore_ctl_error) { if (err < 0 && cval->mixer->ignore_ctl_error) {
Expand All @@ -1325,7 +1325,7 @@ static int mixer_ctl_procunit_get(struct snd_kcontrol *kcontrol, struct snd_ctl_
static int mixer_ctl_procunit_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) static int mixer_ctl_procunit_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
struct usb_mixer_elem_info *cval = kcontrol->private_data; struct usb_mixer_elem_info *cval = kcontrol->private_data;
int val, oval = {0}, err; int val, oval = 0, err;


err = get_cur_ctl_value(cval, cval->control << 8, &oval); err = get_cur_ctl_value(cval, cval->control << 8, &oval);
if (err < 0) { if (err < 0) {
Expand Down Expand Up @@ -1566,7 +1566,7 @@ static int mixer_ctl_selector_info(struct snd_kcontrol *kcontrol, struct snd_ctl
static int mixer_ctl_selector_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) static int mixer_ctl_selector_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
struct usb_mixer_elem_info *cval = kcontrol->private_data; struct usb_mixer_elem_info *cval = kcontrol->private_data;
int val = {0}, err; int val = 0, err;


err = get_cur_ctl_value(cval, cval->control << 8, &val); err = get_cur_ctl_value(cval, cval->control << 8, &val);
if (err < 0) { if (err < 0) {
Expand All @@ -1584,7 +1584,7 @@ static int mixer_ctl_selector_get(struct snd_kcontrol *kcontrol, struct snd_ctl_
static int mixer_ctl_selector_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) static int mixer_ctl_selector_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
struct usb_mixer_elem_info *cval = kcontrol->private_data; struct usb_mixer_elem_info *cval = kcontrol->private_data;
int val, oval = {0}, err; int val, oval = 0, err;


err = get_cur_ctl_value(cval, cval->control << 8, &oval); err = get_cur_ctl_value(cval, cval->control << 8, &oval);
if (err < 0) { if (err < 0) {
Expand Down

0 comments on commit 0b24406

Please sign in to comment.